geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r531664 - /geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
Date Mon, 23 Apr 2007 23:54:54 GMT
Author: dain
Date: Mon Apr 23 16:54:54 2007
New Revision: 531664

URL: http://svn.apache.org/viewvc?view=rev&rev=531664
Log:
fix null pointer exception

Modified:
    geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?view=diff&rev=531664&r1=531663&r2=531664
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
Mon Apr 23 16:54:54 2007
@@ -79,10 +79,10 @@
 
         List<EnvEntryType> envEntriesUntyped = convert(specDD.selectChildren(envEntryQNameSet),
JEE_CONVERTER, EnvEntryType.class, EnvEntryType.type);
         for (EnvEntryType envEntry: envEntriesUntyped) {
-            String name = envEntry.getEnvEntryName().getStringValue().trim();
+            String name = getStringValue(envEntry.getEnvEntryName());
             addInjections(name, envEntry.getInjectionTargetArray(), componentContext);
-            String type = envEntry.getEnvEntryType().getStringValue().trim();
-            String text = envEntry.getEnvEntryValue().getStringValue().trim();
+            String type = getStringValue(envEntry.getEnvEntryType());
+            String text = getStringValue(envEntry.getEnvEntryValue());
             try {
                 Object value;
                 if (text == null) {
@@ -153,7 +153,7 @@
                 boolean exists = false;
                 EnvEntryType[] envEntries = annotatedApp.getEnvEntryArray();
                 for (EnvEntryType envEntry : envEntries) {
-                    if (envEntry.getEnvEntryName().getStringValue().trim().equals(resourceName))
{
+                    if (getStringValue(envEntry.getEnvEntryName()).equals(resourceName))
{
                         exists = true;
                         break;
                     }



Mime
View raw message