Author: markt
Date: Fri Dec 23 19:06:25 2011
New Revision: 1222803
URL: http://svn.apache.org/viewvc?rev=1222803&view=rev
Log:
Simplify search since Tomcat only uses xml descriptors
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=1222803&r1=1222802&r2=1222803&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:06:25 2011
@@ -709,31 +709,21 @@ public class Registry implements Registr
if( searchedPaths.get( packageName ) != null ) {
return;
}
- String descriptors=res + "/mbeans-descriptors.ser";
- URL dURL=classLoader.getResource( descriptors );
+ String descriptors = res + "/mbeans-descriptors.xml";
+ URL dURL = classLoader.getResource( descriptors );
- if( dURL == null ) {
- descriptors=res + "/mbeans-descriptors.xml";
- dURL=classLoader.getResource( descriptors );
- }
- if( dURL == null ) {
+ if (dURL == null) {
return;
}
log.debug( "Found " + dURL);
searchedPaths.put( packageName, dURL );
try {
- if( descriptors.endsWith(".xml" ))
- loadDescriptors("MbeansDescriptorsDigesterSource", dURL, null);
- else
- loadDescriptors("MbeansDescriptorsSerSource", dURL, null);
- return;
+ loadDescriptors("MbeansDescriptorsDigesterSource", dURL, null);
} catch(Exception ex ) {
log.error("Error loading " + dURL);
}
-
- return;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
