1. opensymphony
  2. xwork

Commits

mrdon  committed 188e001

Added passing of location object whenever ActionConfig is cloned

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

  • Participants
  • Parent commits 5aec47a
  • Branches master

Comments (0)

Files changed (3)

File src/java/com/opensymphony/xwork2/config/impl/ActionConfigMatcher.java

View file
         
         ActionConfig config = new ActionConfig(methodName, className, pkgName, 
                 params, results, orig.getInterceptors(), refs, exs);
+        config.setLocation(orig.getLocation());
         
         return config;
     }

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

View file
         List<ExceptionMappingConfig> exceptionMappings = baseConfig.getExceptionMappings();
         exceptionMappings.addAll(packageContext.getAllExceptionMappingConfigs());
 
-        return new ActionConfig(baseConfig.getMethodName(), baseConfig.getClassName(), packageContext.getName(), params, results,
+        ActionConfig config = new ActionConfig(baseConfig.getMethodName(), baseConfig.getClassName(), packageContext.getName(), params, results,
                 interceptors, externalRefs, exceptionMappings);
+        config.setLocation(baseConfig.getLocation());
+        return config;
     }
 
 

File src/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java

View file
         String methodName = actionElement.getAttribute("method");
         Location location = DomHelper.getLocationObject(actionElement);
 
+        if (location == null) {
+            System.out.println("location null for "+className);
+        }
         //methodName should be null if it's not set
         methodName = (methodName.trim().length() > 0) ? methodName.trim() : null;