svn commit: r1427164 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: config/BeansDeployer.java util/ClassUtil.java

[struberg]

Author: struberg
Date: Mon Dec 31 16:21:03 2012
New Revision: 1427164

URL: http://svn.apache.org/viewvc?rev=1427164&view=rev
Log:
OWB-549 and the last useless method is gone now ;)

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1427164&r1=1427163&r2=1427164&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
 Mon Dec 31 16:21:03 2012
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.lang.annotation.Annotation;
 import java.net.URL;
+import java.security.PrivilegedActionException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -60,6 +61,7 @@ import org.apache.webbeans.decorator.Web
 import org.apache.webbeans.deployment.StereoTypeModel;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.exception.WebBeansDeploymentException;
+import org.apache.webbeans.exception.WebBeansException;
 import 
org.apache.webbeans.exception.inject.InconsistentSpecializationException;
 import org.apache.webbeans.intercept.webbeans.WebBeansInterceptor;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
@@ -243,7 +245,7 @@ public class BeansDeployer
         Class<?> beanClass = ClassUtil.getClassFromName(className);
         if(beanClass != null)
         {
-            bean  = (Bean)ClassUtil.newInstance(webBeansContext, beanClass);
+            bean  = (Bean)newInstance( beanClass);
         }
         
         if(bean != null)
@@ -251,7 +253,36 @@ public class BeansDeployer
             manager.addInternalBean(bean);
         }
     }
-    
+
+    /**
+     * create a new instance of the class
+     */
+    private Object newInstance(Class<?> clazz)
+    {
+        try
+        {
+            if(System.getSecurityManager() != null)
+            {
+                return 
webBeansContext.getSecurityService().doPrivilegedObjectCreate(clazz);
+            }
+
+            return clazz.newInstance();
+
+        }
+        catch(Exception e)
+        {
+            Throwable cause = e;
+            if(e instanceof PrivilegedActionException)
+            {
+                cause = e.getCause();
+            }
+
+            String error = "Error occurred while creating an instance of class 
: " + clazz.getName();
+            logger.log(Level.SEVERE, error, cause);
+            throw new WebBeansException(error,cause);
+        }
+    }
+
     /**
      * Fires event before bean discovery.
      */

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=1427164&r1=1427163&r2=1427164&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
 Mon Dec 31 16:21:03 2012
@@ -34,7 +34,6 @@ import java.lang.reflect.ParameterizedTy
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.lang.reflect.WildcardType;
-import java.security.PrivilegedActionException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -42,7 +41,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -78,36 +76,6 @@ public final class ClassUtil
         throw new UnsupportedOperationException();
     }
 
-    /**
-     * @deprecated having this static public method is most probably a 
security risk
-     */
-    public static Object newInstance(WebBeansContext webBeansContext, Class<?> 
clazz)
-    {
-        try
-        {
-            if(System.getSecurityManager() != null)
-            {
-                return 
webBeansContext.getSecurityService().doPrivilegedObjectCreate(clazz);
-            }            
-            
-            return clazz.newInstance();
-            
-        }
-        catch(Exception e)
-        {
-            Throwable cause = e;
-            if(e instanceof PrivilegedActionException)
-            {
-                cause = e.getCause();
-            }
-            
-            String error = "Error occurred while creating an instance of class 
: " + clazz.getName(); 
-            logger.log(Level.SEVERE, error, cause);
-            throw new WebBeansException(error,cause); 
-        
-        }
-    }
-
     public static Class<?> getClassFromName(String name)
     {
         Class<?> clazz;