------------------------------------------------------------
revno: 16878
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Tue 2014-09-30 16:27:03 +0700
message:
minor fix
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/Jackson2PropertyIntrospectorService.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/Jackson2PropertyIntrospectorService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/Jackson2PropertyIntrospectorService.java 2014-09-30 07:02:57 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/Jackson2PropertyIntrospectorService.java 2014-09-30 09:27:03 +0000
@@ -48,6 +48,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -67,7 +68,13 @@
{
Map<String, Property> propertyMap = Maps.newHashMap();
ClassMetadata classMetadata = sessionFactory.getClassMetadata( clazz );
- List<String> classPropertyNames = Lists.newArrayList( classMetadata.getPropertyNames() );
+ List<String> classPropertyNames = new ArrayList<>();
+
+ if ( classMetadata != null )
+ {
+ classPropertyNames = Lists.newArrayList( classMetadata.getPropertyNames() );
+ }
+
List<String> classFieldNames = ReflectionUtils.getAllFieldNames( clazz );
// TODO this is quite nasty, should find a better way of exposing properties at class-level
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
