Commits

dres  committed 92bc9f8

fixed broken build because of missing null check

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@774e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits ae85d84

Comments (0)

Files changed (1)

File src/java/com/opensymphony/xwork/config/impl/DefaultConfiguration.java

                 // fail over to default action
                 if (config == null) {
                 	String defaultActionRef = (String) namespaceConfigs.get((namespace == null) ? "" : namespace);
-                	config = (ActionConfig) actions.get(defaultActionRef);
+                	if (defaultActionRef != null) {
+                		config = (ActionConfig) actions.get(defaultActionRef);
+                	}
                 }
             }
 
                     config = (ActionConfig) actions.get(name);
                     // fail over to default action
                     if (config == null) {
-                    	String defaultActionRef = (String) namespaceConfigs.get((namespace == null) ? "" : namespace);
-                    	config = (ActionConfig) actions.get(defaultActionRef);
+                    	String defaultActionRef = (String) namespaceConfigs.get("");
+                    	if (defaultActionRef != null) {
+                    		config = (ActionConfig) actions.get(defaultActionRef);
+                    	}
                     }
                 }
             }