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/02 19:02:04 UTC

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

dims        2005/08/02 10:02:04

  Modified:    java/src/org/apache/axis Message.java
               java/src/org/apache/axis/client Call.java
               java/src/org/apache/axis/utils ClassUtils.java
  Log:
  Fix for AXIS-2145 - Axis Client crashes the applet unless new permissions are added to the policy file (or a custom security manager is used)
  
  Revision  Changes    Path
  1.122     +2 -0      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.121
  retrieving revision 1.122
  diff -u -r1.121 -r1.122
  --- Message.java	31 Jul 2005 21:59:37 -0000	1.121
  +++ Message.java	2 Aug 2005 17:02:03 -0000	1.122
  @@ -283,6 +283,8 @@
                   // no support for it, leave mAttachments null.
               } catch (java.lang.NoClassDefFoundError ex) {
                   // no support for it, leave mAttachments null.
  +            } catch (java.lang.SecurityException ex) {
  +                // no support for it, leave mAttachments null.
               }
               log.debug(Messages.getMessage("attachEnabled") + "  " +
                       attachmentSupportEnabled);
  
  
  
  1.244     +10 -1     ws-axis/java/src/org/apache/axis/client/Call.java
  
  Index: Call.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/client/Call.java,v
  retrieving revision 1.243
  retrieving revision 1.244
  diff -u -r1.243 -r1.244
  --- Call.java	31 Jul 2005 21:59:37 -0000	1.243
  +++ Call.java	2 Aug 2005 17:02:04 -0000	1.244
  @@ -2014,7 +2014,16 @@
               currentPackages.append('|');
           }
   
  -        System.setProperty(TRANSPORT_PROPERTY, currentPackages.toString());
  +        final String transportProperty = currentPackages.toString();
  +        java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() {
  +            public Object run() {
  +                try {
  +                    System.setProperty(TRANSPORT_PROPERTY, transportProperty);
  +                } catch (SecurityException se){
  +                }
  +                return null;
  +            }
  +        });
       }
   
       /**
  
  
  
  1.12      +1 -0      ws-axis/java/src/org/apache/axis/utils/ClassUtils.java
  
  Index: ClassUtils.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/utils/ClassUtils.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ClassUtils.java	25 Jan 2005 18:15:40 -0000	1.11
  +++ ClassUtils.java	2 Aug 2005 17:02:04 -0000	1.12
  @@ -167,6 +167,7 @@
                                   ClassLoader classLoader = getClassLoader(className);
                                   return Class.forName(className, true, classLoader);
                               } catch (ClassNotFoundException cnfe) {
  +                            } catch (SecurityException cnfe) {
                               }
                               
                               try {