ATLAS-134 Some defects found when reviewing the source code (ltfxyz via shwethags)

distro/src/test/python/scripts/TestMetadata.py

@@ -49,9 +49,9 @@ class TestMetadata(unittest.TestCase):
     if IS_WINDOWS:
       java_mock.assert_called_with(
         'org.apache.atlas.Main',
-        ['-app', 'metadata_home/server/webapp/atlas'],
-        'metadata_home/conf:metadata_home/server/webapp/atlas/WEB-INF/classes:metadata_home/server/webapp/atlas/WEB-INF/lib\\*:metadata_home/libext\\*',
-        ['-Datlas.log.dir=metadata_home/logs', '-Datlas.log.file=application.log', '-Datlas.home=metadata_home', '-Datlas.conf=metadata_home/conf', '-Xmx1024m', '-XX:MaxPermSize=512m', '-Dlog4j.configuration=atlas-log4j.xml'], 'metadata_home/logs')
+        ['-app', 'metadata_home\\server\\webapp\\atlas'],
+        'metadata_home\\conf:metadata_home\\server\\webapp\\atlas\\WEB-INF\\classes:metadata_home\\server\\webapp\\atlas\\WEB-INF\\lib\\*:metadata_home\\libext\\*',
+        ['-Datlas.log.dir=metadata_home\\logs', '-Datlas.log.file=application.log', '-Datlas.home=metadata_home', '-Datlas.conf=metadata_home\\conf', '-Xmx1024m', '-XX:MaxPermSize=512m', '-Dlog4j.configuration=atlas-log4j.xml'], 'metadata_home\\logs')
     else:
       java_mock.assert_called_with(
         'org.apache.atlas.Main',

release-log.txt

@@ -9,6 +9,7 @@ ATLAS-54 Rename configs in hive hook (shwethags)
 ATLAS-3 Mixed Index creation fails with Date types (suma.shivaprasad via shwethags)
 
 ALL CHANGES:
+ATLAS-134 Some defects found when reviewing the source code (ltfxyz via shwethags)
 ATLAS-196 Fix solr documentation (suma.shivaprasad via shwethags)
 ATLAS-195 Document Hbase configs (suma.shivaprasad via shwethags)
 ATLAS-102 Issue with SolrIndex (suma.shivaprasad via shwethags)

repository/src/main/java/org/apache/atlas/repository/memory/AttributeStores.java

@@ -55,7 +55,7 @@ public class AttributeStores {
             } else if (i.dataType() == DataTypes.BYTE_TYPE) {
                 return new ByteAttributeStore(i);
             } else if (i.dataType() == DataTypes.SHORT_TYPE) {
-                new ShortAttributeStore(i);
+                return new ShortAttributeStore(i);
             } else if (i.dataType() == DataTypes.INT_TYPE) {
                 return new IntAttributeStore(i);
             } else if (i.dataType() == DataTypes.LONG_TYPE) {

typesystem/src/main/java/org/apache/atlas/typesystem/types/ObjectGraphTraversal.java

@@ -53,7 +53,7 @@ public class ObjectGraphTraversal implements Iterator<ObjectGraphTraversal.Insta
                 processCollection(elemType, val);
             } else if (dT.getTypeCategory() == DataTypes.TypeCategory.MAP) {
                 IDataType keyType = ((DataTypes.MapType) dT).getKeyType();
-                IDataType valueType = ((DataTypes.MapType) dT).getKeyType();
+                IDataType valueType = ((DataTypes.MapType) dT).getValueType();
                 processMap(keyType, valueType, val);
             } else if (dT.getTypeCategory() == DataTypes.TypeCategory.STRUCT
                     || dT.getTypeCategory() == DataTypes.TypeCategory.TRAIT) {

typesystem/src/main/java/org/apache/atlas/typesystem/types/ObjectGraphWalker.java

@@ -91,7 +91,7 @@ public class ObjectGraphWalker {
                 visitCollection(elemType, val);
             } else if (dT.getTypeCategory() == DataTypes.TypeCategory.MAP) {
                 IDataType keyType = ((DataTypes.MapType) dT).getKeyType();
-                IDataType valueType = ((DataTypes.MapType) dT).getKeyType();
+                IDataType valueType = ((DataTypes.MapType) dT).getValueType();
                 visitMap(keyType, valueType, val);
             } else if (dT.getTypeCategory() == DataTypes.TypeCategory.STRUCT
                     || dT.getTypeCategory() == DataTypes.TypeCategory.TRAIT) {