tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1176157 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/modeler/ManagedBean.java java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
Date Tue, 27 Sep 2011 01:21:08 GMT
Author: kkolinko
Date: Tue Sep 27 01:21:08 2011
New Revision: 1176157

URL: http://svn.apache.org/viewvc?rev=1176157&view=rev
Log:
Merged revision 1174325 from tomcat/trunk:
Fix a small number of Eclipse warnings.
 - Unused code
 - Unnecessary null checks

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 27 01:21:08 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288
 ,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175713,1175889,1175896,1175907
+/tomcat/trunk:1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288
 ,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175713,1175889,1175896,1175907

Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=1176157&r1=1176156&r2=1176157&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java Tue Sep 27 01:21:08
2011
@@ -483,148 +483,141 @@ public class ManagedBean implements java
     }
 
     Method getGetter(String aname, BaseModelMBean mbean, Object resource) 
-            throws AttributeNotFoundException, MBeanException, ReflectionException {
-        // TODO: do we need caching ? JMX is for management, it's not supposed to require
lots of performance.
-        Method m=null; // (Method)getAttMap.get( name );
-
-        if( m==null ) {
-            AttributeInfo attrInfo = attributes.get(aname);
-            // Look up the actual operation to be used
-            if (attrInfo == null)
-                throw new AttributeNotFoundException(" Cannot find attribute " + aname +
" for " + resource);
-            
-            String getMethod = attrInfo.getGetMethod();
-            if (getMethod == null)
-                throw new AttributeNotFoundException("Cannot find attribute " + aname + "
get method name");
+            throws AttributeNotFoundException, ReflectionException {
 
-            Object object = null;
-            NoSuchMethodException exception = null;
+        Method m = null;
+
+        AttributeInfo attrInfo = attributes.get(aname);
+        // Look up the actual operation to be used
+        if (attrInfo == null)
+            throw new AttributeNotFoundException(" Cannot find attribute " + aname + " for
" + resource);
+        
+        String getMethod = attrInfo.getGetMethod();
+        if (getMethod == null)
+            throw new AttributeNotFoundException("Cannot find attribute " + aname + " get
method name");
+
+        Object object = null;
+        NoSuchMethodException exception = null;
+        try {
+            object = mbean;
+            m = object.getClass().getMethod(getMethod, NO_ARGS_PARAM_SIG);
+        } catch (NoSuchMethodException e) {
+            exception = e;
+        }
+        if( m== null && resource != null ) {
             try {
-                object = mbean;
+                object = resource;
                 m = object.getClass().getMethod(getMethod, NO_ARGS_PARAM_SIG);
+                exception=null;
             } catch (NoSuchMethodException e) {
                 exception = e;
             }
-            if( m== null && resource != null ) {
-                try {
-                    object = resource;
-                    m = object.getClass().getMethod(getMethod, NO_ARGS_PARAM_SIG);
-                    exception=null;
-                } catch (NoSuchMethodException e) {
-                    exception = e;
-                }
-            }
-            if( exception != null )
-                throw new ReflectionException(exception,
-                                              "Cannot find getter method " + getMethod);
-            //getAttMap.put( name, m );
         }
+        if( exception != null )
+            throw new ReflectionException(exception,
+                                          "Cannot find getter method " + getMethod);
 
         return m;
     }
 
     public Method getSetter(String aname, BaseModelMBean bean, Object resource) 
-            throws AttributeNotFoundException, MBeanException, ReflectionException {
-        // Cache may be needed for getters, but it is a really bad idea for setters, this
is far 
-        // less frequent.
-        Method m=null;//(Method)setAttMap.get( name );
-
-        if( m==null ) {
-            AttributeInfo attrInfo = attributes.get(aname);
-            if (attrInfo == null)
-                throw new AttributeNotFoundException(" Cannot find attribute " + aname);
-
-            // Look up the actual operation to be used
-            String setMethod = attrInfo.getSetMethod();
-            if (setMethod == null)
-                throw new AttributeNotFoundException("Cannot find attribute " + aname + "
set method name");
+            throws AttributeNotFoundException, ReflectionException {
 
-            String argType=attrInfo.getType();
+        Method m = null;
 
-            Class<?> signature[] =
-                new Class[] { BaseModelMBean.getAttributeClass( argType ) };
-
-            Object object = null;
-            NoSuchMethodException exception = null;
+        AttributeInfo attrInfo = attributes.get(aname);
+        if (attrInfo == null)
+            throw new AttributeNotFoundException(" Cannot find attribute " + aname);
+
+        // Look up the actual operation to be used
+        String setMethod = attrInfo.getSetMethod();
+        if (setMethod == null)
+            throw new AttributeNotFoundException("Cannot find attribute " + aname + " set
method name");
+
+        String argType=attrInfo.getType();
+
+        Class<?> signature[] =
+            new Class[] { BaseModelMBean.getAttributeClass( argType ) };
+
+        Object object = null;
+        NoSuchMethodException exception = null;
+        try {
+            object = bean;
+            m = object.getClass().getMethod(setMethod, signature);
+        } catch (NoSuchMethodException e) {
+            exception = e;
+        }
+        if( m== null && resource != null ) {
             try {
-                object = bean;
+                object = resource;
                 m = object.getClass().getMethod(setMethod, signature);
+                exception=null;
             } catch (NoSuchMethodException e) {
                 exception = e;
             }
-            if( m== null && resource != null ) {
-                try {
-                    object = resource;
-                    m = object.getClass().getMethod(setMethod, signature);
-                    exception=null;
-                } catch (NoSuchMethodException e) {
-                    exception = e;
-                }
-            }
-            if( exception != null )
-                throw new ReflectionException(exception,
-                                              "Cannot find setter method " + setMethod +
-                        " " + resource);
-            //setAttMap.put( name, m );
         }
+        if( exception != null )
+            throw new ReflectionException(exception,
+                                          "Cannot find setter method " + setMethod +
+                    " " + resource);
 
         return m;
     }
 
     public Method getInvoke(String aname, Object[] params, String[] signature, BaseModelMBean
bean, Object resource) 
             throws MBeanException, ReflectionException {
+
         Method method = null;
-        if (method == null) {
-            if (params == null)
-                params = new Object[0];
-            if (signature == null)
-                signature = new String[0];
-            if (params.length != signature.length)
-                throw new RuntimeOperationsException(
-                        new IllegalArgumentException(
-                                "Inconsistent arguments and signature"),
-                        "Inconsistent arguments and signature");
-
-            // Acquire the ModelMBeanOperationInfo information for
-            // the requested operation
-            OperationInfo opInfo = operations.get(aname);
-            if (opInfo == null)
-                throw new MBeanException(new ServiceNotFoundException(
-                        "Cannot find operation " + aname),
-                        "Cannot find operation " + aname);
-
-            // Prepare the signature required by Java reflection APIs
-            // FIXME - should we use the signature from opInfo?
-            Class<?> types[] = new Class[signature.length];
-            for (int i = 0; i < signature.length; i++) {
-                types[i] = BaseModelMBean.getAttributeClass(signature[i]);
-            }
+        
+        if (params == null)
+            params = new Object[0];
+        if (signature == null)
+            signature = new String[0];
+        if (params.length != signature.length)
+            throw new RuntimeOperationsException(
+                    new IllegalArgumentException(
+                            "Inconsistent arguments and signature"),
+                    "Inconsistent arguments and signature");
+
+        // Acquire the ModelMBeanOperationInfo information for
+        // the requested operation
+        OperationInfo opInfo = operations.get(aname);
+        if (opInfo == null)
+            throw new MBeanException(new ServiceNotFoundException(
+                    "Cannot find operation " + aname),
+                    "Cannot find operation " + aname);
+
+        // Prepare the signature required by Java reflection APIs
+        // FIXME - should we use the signature from opInfo?
+        Class<?> types[] = new Class[signature.length];
+        for (int i = 0; i < signature.length; i++) {
+            types[i] = BaseModelMBean.getAttributeClass(signature[i]);
+        }
 
-            // Locate the method to be invoked, either in this MBean itself
-            // or in the corresponding managed resource
-            // FIXME - Accessible methods in superinterfaces?
-            Object object = null;
-            Exception exception = null;
-            try {
-                object = bean;
+        // Locate the method to be invoked, either in this MBean itself
+        // or in the corresponding managed resource
+        // FIXME - Accessible methods in superinterfaces?
+        Object object = null;
+        Exception exception = null;
+        try {
+            object = bean;
+            method = object.getClass().getMethod(aname, types);
+        } catch (NoSuchMethodException e) {
+            exception = e;
+        }
+        try {
+            if ((method == null) && (resource != null)) {
+                object = resource;
                 method = object.getClass().getMethod(aname, types);
-            } catch (NoSuchMethodException e) {
-                exception = e;
             }
-            try {
-                if ((method == null) && (resource != null)) {
-                    object = resource;
-                    method = object.getClass().getMethod(aname, types);
-                }
-            } catch (NoSuchMethodException e) {
-                exception = e;
-            }
-            if (method == null) {
-                throw new ReflectionException(exception, "Cannot find method "
-                        + aname + " with this signature");
-            }
-            // invokeAttMap.put(mkey, method);
+        } catch (NoSuchMethodException e) {
+            exception = e;
         }
+        if (method == null) {
+            throw new ReflectionException(exception, "Cannot find method "
+                    + aname + " with this signature");
+        }
+
         return method;
     }
 

Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java?rev=1176157&r1=1176156&r2=1176157&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
Tue Sep 27 01:21:08 2011
@@ -44,7 +44,7 @@ public class MbeansDescriptorsDigesterSo
     List<ObjectName> mbeans = new ArrayList<ObjectName>();
     protected static volatile Digester digester = null;
     
-    protected static Digester createDigester(Registry registry) {
+    protected static Digester createDigester() {
 
         Digester digester = new Digester();
         digester.setNamespaceAware(false);
@@ -223,7 +223,7 @@ public class MbeansDescriptorsDigesterSo
         InputStream stream = (InputStream) source;
 
         if (digester == null) {
-            digester = createDigester(registry);
+            digester = createDigester();
         }
         ArrayList<ManagedBean> loadedMbeans = new ArrayList<ManagedBean>();
         

Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java?rev=1176157&r1=1176156&r2=1176157&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java Tue
Sep 27 01:21:08 2011
@@ -340,8 +340,7 @@ public class MbeansSource extends Modele
                         " " + value);
             ObjectName oname=new ObjectName(objectName);
             // find the type
-            if( type==null )
-                type=registry.getType(  oname, attName );
+            type=registry.getType(  oname, attName );
 
             if( type==null ) {
                 log.info("Can't find attribute " + objectName + " " + attName );



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message