From 18869e66d2b785411f35e409a8b43e233ead6831 Mon Sep 17 00:00:00 2001
From: chiba <chiba@30ef5769-5b8d-40dd-aea6-55b5d6557bb3>
Date: Sun, 9 Mar 2008 13:07:12 +0000
Subject: [PATCH] preparation for 3.7.1 release

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@421 30ef5769-5b8d-40dd-aea6-55b5d6557bb3
---
 Readme.html                                   |   5 +
 build.xml                                     |   2 +-
 src/main/META-INF/MANIFEST.MF                 |   2 +-
 src/main/javassist/CtClass.java               |   2 +-
 .../javassist/util/proxy/SecurityActions.java | 225 ++++++++----------
 5 files changed, 106 insertions(+), 130 deletions(-)

diff --git a/Readme.html b/Readme.html
index 8f0bac7a..6827b03d 100644
--- a/Readme.html
+++ b/Readme.html
@@ -281,6 +281,11 @@ see javassist.Dump.
 
 <h2>Changes</h2>
 
+<p>-version 3.7.1 on March 10, 2008
+<ul>
+    <li>a bug of javassist.util.proxy has been fixed.
+</ul>
+
 <p>-version 3.7 on January 20, 2008
 <ul>
 	<li>Several minor bugs have been fixed.
diff --git a/build.xml b/build.xml
index 1a6385e0..2de5a2e8 100644
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,7 @@
 
 <project name="javassist" default="jar" basedir=".">
 
-  <property name="dist-version" value="javassist-3.7"/>
+  <property name="dist-version" value="javassist-3.7.1"/>
 
   <property environment="env"/>
   <property name="target.jar" value="javassist.jar"/>
diff --git a/src/main/META-INF/MANIFEST.MF b/src/main/META-INF/MANIFEST.MF
index 4789d0fc..ed798ac1 100644
--- a/src/main/META-INF/MANIFEST.MF
+++ b/src/main/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.1
 Specification-Title: Javassist
 Created-By: Shigeru Chiba, Tokyo Institute of Technology
 Specification-Vendor: Shigeru Chiba, Tokyo Institute of Technology
-Specification-Version: 3.7
+Specification-Version: 3.7.1
 Main-Class: javassist.CtClass
 
 Name: javassist/
diff --git a/src/main/javassist/CtClass.java b/src/main/javassist/CtClass.java
index d676ded3..46351819 100644
--- a/src/main/javassist/CtClass.java
+++ b/src/main/javassist/CtClass.java
@@ -52,7 +52,7 @@ public abstract class CtClass {
     /**
      * The version number of this release.
      */
-    public static final String version = "3.7.0.GA";
+    public static final String version = "3.7.1.GA";
 
     /**
      * Prints the version number and the copyright notice.
diff --git a/src/main/javassist/util/proxy/SecurityActions.java b/src/main/javassist/util/proxy/SecurityActions.java
index e7784b89..40741e40 100755
--- a/src/main/javassist/util/proxy/SecurityActions.java
+++ b/src/main/javassist/util/proxy/SecurityActions.java
@@ -23,142 +23,113 @@ import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 
-class SecurityActions
-{
-    static Method[] getDeclaredMethods(final Class clazz)
-    {
-       if (System.getSecurityManager() == null)
-       {
-          return clazz.getDeclaredMethods();
-       }
-       else
-       {
-          return (Method[])AccessController.doPrivileged(new PrivilegedAction() {
-
-            public Object run()
-            {
-               return clazz.getDeclaredMethods();
-            }});
-       }
+class SecurityActions {
+    static Method[] getDeclaredMethods(final Class clazz) {
+        if (System.getSecurityManager() == null)
+            return clazz.getDeclaredMethods();
+        else {
+            return (Method[]) AccessController
+                    .doPrivileged(new PrivilegedAction() {
+                        public Object run() {
+                            return clazz.getDeclaredMethods();
+                        }
+                    });
+        }
     }
-    
-    static Constructor[] getDeclaredConstructors(final Class clazz)
-    {
-       if (System.getSecurityManager() == null)
-       {
-          return clazz.getDeclaredConstructors();
-       }
-       else
-       {
-          return (Constructor[])AccessController.doPrivileged(new PrivilegedAction() {
 
-            public Object run()
-            {
-               return clazz.getDeclaredConstructors();
-            }});
-       }
+    static Constructor[] getDeclaredConstructors(final Class clazz) {
+        if (System.getSecurityManager() == null)
+            return clazz.getDeclaredConstructors();
+        else {
+            return (Constructor[]) AccessController
+                    .doPrivileged(new PrivilegedAction() {
+                        public Object run() {
+                            return clazz.getDeclaredConstructors();
+                        }
+                    });
+        }
     }
-    
-    static Method getDeclaredMethod(final Class clazz, final String name, final Class[] types) throws NoSuchMethodException
-    {
-       if (System.getSecurityManager() == null)
-       {
-          return clazz.getDeclaredMethod(name, types);
-       }
-       else
-       {
-          try
-          {
-             return (Method)AccessController.doPrivileged(new PrivilegedExceptionAction() {
 
-                public Object run()throws Exception
-                {
-                   return clazz.getDeclaredMethod(name, types);
-                }});
-          }
-          catch(PrivilegedActionException e)
-          {
-             if (e.getCause() instanceof NoSuchMethodException)
-             {
-                throw (NoSuchMethodException)e.getCause();
-             }
-             throw new RuntimeException(e.getCause());
-          }
-       }
+    static Method getDeclaredMethod(final Class clazz, final String name,
+            final Class[] types) throws NoSuchMethodException {
+        if (System.getSecurityManager() == null)
+            return clazz.getDeclaredMethod(name, types);
+        else {
+            try {
+                return (Method) AccessController
+                        .doPrivileged(new PrivilegedExceptionAction() {
+                            public Object run() throws Exception {
+                                return clazz.getDeclaredMethod(name, types);
+                            }
+                        });
+            }
+            catch (PrivilegedActionException e) {
+                if (e.getCause() instanceof NoSuchMethodException)
+                    throw (NoSuchMethodException) e.getCause();
+
+                throw new RuntimeException(e.getCause());
+            }
+        }
     }
-    
-    static Constructor getDeclaredConstructor(final Class clazz, final Class[] types) throws NoSuchMethodException
+
+    static Constructor getDeclaredConstructor(final Class clazz,
+                                              final Class[] types)
+        throws NoSuchMethodException
     {
-       if (System.getSecurityManager() == null)
-       {
-          return clazz.getDeclaredConstructor(types);
-       }
-       else
-       {
-          try
-         {
-            return (Constructor)AccessController.doPrivileged(new PrivilegedExceptionAction() {
+        if (System.getSecurityManager() == null)
+            return clazz.getDeclaredConstructor(types);
+        else {
+            try {
+                return (Constructor) AccessController
+                        .doPrivileged(new PrivilegedExceptionAction() {
+                            public Object run() throws Exception {
+                                return clazz.getDeclaredConstructor(types);
+                            }
+                        });
+            }
+            catch (PrivilegedActionException e) {
+                if (e.getCause() instanceof NoSuchMethodException)
+                    throw (NoSuchMethodException) e.getCause();
 
-               public Object run() throws Exception
-               {
-                  return clazz.getDeclaredConstructor(types);
-               }});
-         }
-         catch (PrivilegedActionException e)
-         {
-            if (e.getCause() instanceof NoSuchMethodException)
-            {
-               throw (NoSuchMethodException)e.getCause();
+                throw new RuntimeException(e.getCause());
             }
-            throw new RuntimeException(e.getCause());
-         }
-       }
-    }    
-    
-    static void setAccessible(final AccessibleObject ao, final boolean accessible)
-    {
-       if (System.getSecurityManager() == null)
-       {
-          ao.setAccessible(accessible);
-       }
-       else
-       {
-          AccessController.doPrivileged(new PrivilegedAction() {
+        }
+    }
 
-            public Object run() 
-            {
-               ao.setAccessible(accessible);
-               return null;
-            }});
-       }
-    }    
-    
-    static void set(final Field fld, final Object target, final Object value) throws IllegalAccessException
+    static void setAccessible(final AccessibleObject ao,
+                              final boolean accessible) {
+        if (System.getSecurityManager() == null)
+            ao.setAccessible(accessible);
+        else {
+            AccessController.doPrivileged(new PrivilegedAction() {
+                public Object run() {
+                    ao.setAccessible(accessible);
+                    return null;
+                }
+            });
+        }
+    }
+
+    static void set(final Field fld, final Object target, final Object value)
+        throws IllegalAccessException
     {
-       if (System.getSecurityManager() == null)
-       {
-          fld.set(target, value);
-       }
-       else
-       {
-          try
-         {
-            AccessController.doPrivileged(new PrivilegedExceptionAction() {
+        if (System.getSecurityManager() == null)
+            fld.set(target, value);
+        else {
+            try {
+                AccessController.doPrivileged(new PrivilegedExceptionAction() {
+                    public Object run() throws Exception {
+                        fld.set(target, value);
+                        return null;
+                    }
+                });
+            }
+            catch (PrivilegedActionException e) {
+                if (e.getCause() instanceof NoSuchMethodException)
+                    throw (IllegalAccessException) e.getCause();
 
-               public Object run() throws Exception 
-               {
-                  fld.set(target, value);
-                  return null;
-               }});
-         }
-         catch (PrivilegedActionException e)
-         {
-            if (e.getCause() instanceof NoSuchMethodException)
-            {
-               throw (IllegalAccessException)e.getCause();
+                throw new RuntimeException(e.getCause());
             }
-            throw new RuntimeException(e.getCause());
-         }
-       }
-    }    
-}
\ No newline at end of file
+        }
+    }
+}
-- 
2.39.5