svn commit: r1341756 - in /axis/axis2/java/core/branches/1_6: ./ modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java

[sagara]

Author: sagara
Date: Wed May 23 06:19:58 2012
New Revision: 1341756

URL: http://svn.apache.org/viewvc?rev=1341756&view=rev
Log:
Merged  r1341090  to the 1.6 branch.

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/core/trunk:r1341090

Modified: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=1341756&r1=1341755&r2=1341756&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java
 Wed May 23 06:19:58 2012
@@ -553,8 +553,7 @@ public class DescriptionBuilder implemen
                     if ((parent != null)
                             && parent.isParameterLocked(parameter.getName())) {
                         throw new DeploymentException(Messages.getMessage(
-                                DeploymentErrorMsgs.CONFIG_NOT_FOUND, parameter
-                                .getName()));
+                                DeploymentErrorMsgs.PARAMETER_LOCKED, 
parameter.getName()));
                     } else {
                         parameter.setLocked(true);
                     }