------------------------------------------------------------
revno: 14507
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Fri 2014-03-28 04:17:47 +0100
message:
quickfix for JA issue, will be fixed properly later
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-27 10:14:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java 2014-03-28 03:17:47 +0000
@@ -30,7 +30,6 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import javassist.util.proxy.ProxyFactory;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.PostConstruct;
@@ -77,17 +76,19 @@
return null;
}
+ /*
if ( ProxyFactory.isProxyClass( klass ) )
{
klass = klass.getSuperclass();
}
+ */
- if ( classSchemaMap.containsKey( klass ) )
+ if ( !classSchemaMap.containsKey( klass ) && classSchemaMap.containsKey( klass.getSuperclass() ) )
{
- return classSchemaMap.get( klass );
+ return classSchemaMap.get( klass.getSuperclass() );
}
- return null;
+ return classSchemaMap.get( klass );
}
@Override
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
