You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/08/20 04:49:32 UTC

cvs commit: ws-axis/java/src/org/apache/axis Message.java

dims        2005/08/19 19:49:32

  Modified:    java/src/org/apache/axis Message.java
  Log:
  Fix for AXIS-2180 - attachments.implementation override property not picked up in client.wsdd
  
  Notes: you can now set the "attachments.implementation" using AxisProperties.
  
  Revision  Changes    Path
  1.123     +9 -9      ws-axis/java/src/org/apache/axis/Message.java
  
  Index: Message.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/Message.java,v
  retrieving revision 1.122
  retrieving revision 1.123
  diff -u -r1.122 -r1.123
  --- Message.java	2 Aug 2005 17:02:03 -0000	1.122
  +++ Message.java	20 Aug 2005 02:49:32 -0000	1.123
  @@ -258,17 +258,17 @@
               //aviod testing and possibly failing everytime.
               checkForAttachmentSupport = false;
               try {
  -                String attachImpName= AxisEngine.DEFAULT_ATTACHMENT_IMPL;
  -                if(null != mc){
  -                    AxisEngine ae= mc.getAxisEngine();
  -                    if(null != ae){
  -                      attachImpName= (String)ae.getOption(
  -                        AxisEngine.PROP_ATTACHMENT_IMPLEMENTATION);
  +                // Get the default setting from AxisProperties
  +                String attachImpName = AxisProperties.getProperty(AxisEngine.PROP_ATTACHMENT_IMPLEMENTATION,
  +                        AxisEngine.DEFAULT_ATTACHMENT_IMPL);
  +                // override the default with any changes specified in the engine configuration
  +                if (null != mc) {
  +                    AxisEngine ae = mc.getAxisEngine();
  +                    if (null != ae) {
  +                        attachImpName = (String) ae.getOption(
  +                                AxisEngine.PROP_ATTACHMENT_IMPLEMENTATION);
                       }
                   }
  -                if(null == attachImpName){
  -                    attachImpName=AxisEngine.DEFAULT_ATTACHMENT_IMPL;
  -                }
   
                   /**
                    * Attempt to resolve class name, verify that these are present...