tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r1356507 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java
Date Mon, 02 Jul 2012 22:19:36 GMT
Author: dblevins
Date: Mon Jul  2 22:19:35 2012
New Revision: 1356507

URL: http://svn.apache.org/viewvc?rev=1356507&view=rev
Log:
TOMEE-267
Default 'type' ignored in <JndiProvider> and related elements

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java?rev=1356507&r1=1356506&r2=1356507&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java
(original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/sys/SaxOpenejb.java
Mon Jul  2 22:19:35 2012
@@ -169,10 +169,10 @@ class SaxOpenejb extends DefaultHandler 
 
         @Override
         public void startElement(String uri, String localName, String qName, Attributes attributes)
{
-            service.setType(attributes.getValue("type"));
-            service.setJar(attributes.getValue("jar"));
-            service.setProvider(attributes.getValue("provider"));
-            service.setId(attributes.getValue("id"));
+            if (attributes.getValue("type") != null) service.setType(attributes.getValue("type"));
+            if (attributes.getValue("jar") != null) service.setJar(attributes.getValue("jar"));
+            if (attributes.getValue("provider") != null) service.setProvider(attributes.getValue("provider"));
+            if (attributes.getValue("id") != null) service.setId(attributes.getValue("id"));
         }
 
         @Override



Mime
View raw message