[jboss-cvs] JBossAS SVN: r58415 - in trunk/server/src/main/org/jboss: deployment ejb/plugins/cmp/jdbc/metadata

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2006-11-15 14:45:52 -0500 (Wed, 15 Nov 2006)
New Revision: 58415

Modified:
   trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
   trunk/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCQlQueryMetaData.java
Log:
fixed result-type-mapping initialization

Modified: trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-11-15 19:03:12 UTC (rev 58414)
+++ trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-11-15 19:45:52 UTC (rev 58415)
@@ -93,7 +93,6 @@
          version = attrs.getValue("", "version");
       if(version != null)
       {
-         log.info("version = " + version);
          if(version.equals("3.0"))
          {
             metaData.setEjbVersion(3);
@@ -389,10 +388,6 @@
    public void addChild(EntityMetaData parent, QueryMetaData query,
          UnmarshallingContext navigator, String namespaceURI, String localName)
    {
-      if(parent.getLocalHome() == null && query.isResultTypeLocal())
-      {
-         query.setResultTypeMapping(QueryMetaData.REMOTE);
-      }
       parent.addQuery(query);
    }
 

Modified: trunk/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCQlQueryMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCQlQueryMetaData.java	2006-11-15 19:03:12 UTC (rev 58414)
+++ trunk/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/metadata/JDBCQlQueryMetaData.java	2006-11-15 19:45:52 UTC (rev 58415)
@@ -70,7 +70,7 @@
       this.method = method;
       this.readAhead = JDBCReadAheadMetaData.DEFAULT;
       ejbQl = queryMetaData.getEjbQl();
-      resultTypeMappingLocal = (queryMetaData.getResultTypeMapping() == QueryMetaData.LOCAL);
+      resultTypeMappingLocal = queryMetaData.getResultTypeMapping().equals(QueryMetaData.LOCAL);
 
       compiler = qlCompiler;
       this.lazyResultSetLoading = lazyResultSetLoading;