Author: markt Date: Fri Dec 23 19:07:04 2011 New Revision: 1222804 URL: http://svn.apache.org/viewvc?rev=1222804&view=rev Log: Remove pointless private method
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1222804&r1=1222803&r2=1222804&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Fri Dec 23 19:07:04 2011 @@ -231,7 +231,7 @@ public class Registry implements Registr */ @Override public void loadMetadata(Object source ) throws Exception { - loadDescriptors( null, source, null ); + load( null, source, null ); } /** Register a bean by creating a modeler mbean and adding it to the @@ -520,8 +520,7 @@ public class Registry implements Registr log.debug( "Dynamic mbean support "); } // Dynamic mbean - loadDescriptors("MbeansDescriptorsDynamicMBeanSource", - bean, type); + load("MbeansDescriptorsDynamicMBeanSource", bean, type); managed=findManagedBean(type); } @@ -533,8 +532,7 @@ public class Registry implements Registr } // introspection - loadDescriptors("MbeansDescriptorsIntrospectionSource", - beanClass, type); + load("MbeansDescriptorsIntrospectionSource", beanClass, type); managed=findManagedBean(type); if( managed==null ) { @@ -720,24 +718,12 @@ public class Registry implements Registr log.debug( "Found " + dURL); searchedPaths.put( packageName, dURL ); try { - loadDescriptors("MbeansDescriptorsDigesterSource", dURL, null); + load("MbeansDescriptorsDigesterSource", dURL, null); } catch(Exception ex ) { log.error("Error loading " + dURL); } } - /** - * @param sourceType - * @param source - * @param param - * @throws Exception - - */ - private void loadDescriptors(String sourceType, Object source, - String param) throws Exception { - load(sourceType, source, param); - } - /** Lookup the component descriptor in the package and * in the parent packages. * --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org