You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2011/05/23 13:49:01 UTC
svn commit: r1126453 -
/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
Author: genspring
Date: Mon May 23 11:49:01 2011
New Revision: 1126453
URL: http://svn.apache.org/viewvc?rev=1126453&view=rev
Log:
NPE protection for resource type.
Modified:
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?rev=1126453&r1=1126452&r2=1126453&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Mon May 23 11:49:01 2011
@@ -282,7 +282,12 @@ public class ResourceRefBuilder extends
Set<AbstractNameQuery> applicationManagedSecurityResources = new HashSet<AbstractNameQuery>();
for (ResourceRef resourceRef : resourceRefList) {
- String type = resourceRef.getResType().trim();
+ String type = resourceRef.getResType();
+ if(type == null){
+ continue;
+ }else {
+ type = type.trim();
+ }
if (!URL.class.getName().equals(type)
&& !"javax.mail.Session".equals(type)