dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14508
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-03-28 04:28:21 +0100
message:
  minor fix
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java	2014-03-28 03:17:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java	2014-03-28 03:28:21 +0000
@@ -83,12 +83,17 @@
         }
         */
 
-        if ( !classSchemaMap.containsKey( klass ) && classSchemaMap.containsKey( klass.getSuperclass() ) )
+        if ( classSchemaMap.containsKey( klass ) )
+        {
+            return classSchemaMap.get( klass );
+        }
+
+        if ( classSchemaMap.containsKey( klass.getSuperclass() ) )
         {
             return classSchemaMap.get( klass.getSuperclass() );
         }
 
-        return classSchemaMap.get( klass );
+        return null;
     }
 
     @Override