You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/02/10 21:43:22 UTC
svn commit: r1444609 - in
/tomcat/trunk/java/org/apache/catalina/storeconfig: StandardContextSF.java
StandardServerSF.java StoreConfigLifecycleListener.java StoreLoader.java
Author: markt
Date: Sun Feb 10 20:43:21 2013
New Revision: 1444609
URL: http://svn.apache.org/r1444609
Log:
Fix various Eclipse warnings
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java?rev=1444609&r1=1444608&r2=1444609&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java Sun Feb 10 20:43:21 2013
@@ -129,12 +129,12 @@ public class StandardContextSF extends S
try {
writer.flush();
} catch (Exception e) {
- ;
+ // Ignore
}
try {
writer.close();
} catch (Throwable t) {
- ;
+ // Ignore
}
}
}
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java?rev=1444609&r1=1444608&r2=1444609&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java Sun Feb 10 20:43:21 2013
@@ -68,25 +68,23 @@ public class StandardServerSF extends St
if (aObject instanceof StandardServer) {
StandardServer server = (StandardServer) aObject;
// Store nested <Listener> elements
- if (server instanceof Lifecycle) {
- LifecycleListener listeners[] = ((Lifecycle) server)
- .findLifecycleListeners();
- storeElementArray(aWriter, indent, listeners);
- /*LifecycleListener listener = null;
- for (int i = 0; listener == null && i < listeners.length; i++)
- if (listeners[i] instanceof ServerLifecycleListener)
- listener = listeners[i];
- if (listener != null) {
- StoreDescription elementDesc = getRegistry()
- .findDescription(
- StandardServer.class.getName()
- + ".[ServerLifecycleListener]");
- if (elementDesc != null) {
- elementDesc.getStoreFactory().store(aWriter, indent,
- listener);
- }
- }*/
- }
+ LifecycleListener listeners[] = ((Lifecycle) server)
+ .findLifecycleListeners();
+ storeElementArray(aWriter, indent, listeners);
+ /*LifecycleListener listener = null;
+ for (int i = 0; listener == null && i < listeners.length; i++)
+ if (listeners[i] instanceof ServerLifecycleListener)
+ listener = listeners[i];
+ if (listener != null) {
+ StoreDescription elementDesc = getRegistry()
+ .findDescription(
+ StandardServer.class.getName()
+ + ".[ServerLifecycleListener]");
+ if (elementDesc != null) {
+ elementDesc.getStoreFactory().store(aWriter, indent,
+ listener);
+ }
+ }*/
// Store nested <GlobalNamingResources> element
NamingResources globalNamingResources = server
.getGlobalNamingResources();
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java?rev=1444609&r1=1444608&r2=1444609&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java Sun Feb 10 20:43:21 2013
@@ -16,8 +16,6 @@
*/
package org.apache.catalina.storeconfig;
-import java.io.InputStream;
-
import javax.management.DynamicMBean;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -89,7 +87,6 @@ public class StoreConfigLifecycleListene
return;
}
MBeanServer mserver = MBeanUtils.createServer();
- InputStream descriptor = null;
try {
ObjectName objectName = new ObjectName("Catalina:type=StoreConfig" );
if (!mserver.isRegistered(objectName)) {
@@ -97,16 +94,6 @@ public class StoreConfigLifecycleListene
}
} catch (Exception ex) {
log.error("createMBean register MBean", ex);
-
- } finally {
- if (descriptor != null) {
- try {
- descriptor.close();
- descriptor = null;
- } catch (Exception ex) {
- log.error("createMBean register MBean", ex);
- }
- }
}
}
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java?rev=1444609&r1=1444608&r2=1444609&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java Sun Feb 10 20:43:21 2013
@@ -142,7 +142,7 @@ public class StoreLoader {
*/
protected File serverFile(String aFile) {
- if (aFile == null || (aFile != null && aFile.length() < 1))
+ if (aFile == null || aFile.length() < 1)
aFile = "server-registry.xml";
File file = new File(aFile);
if (!file.isAbsolute())
@@ -195,10 +195,8 @@ public class StoreLoader {
if (configUrl != null) {
is = (new URL(configUrl)).openStream();
if (log.isInfoEnabled())
- log
- .info("Find registry server-registry.xml from system property at url "
- + configUrl);
- ;
+ log.info("Find registry server-registry.xml from system property at url "
+ + configUrl);
registryResource = new URL(configUrl);
}
} catch (Throwable t) {
@@ -213,7 +211,6 @@ public class StoreLoader {
if (log.isInfoEnabled())
log.info("Find registry server-registry.xml at file "
+ reg.getCanonicalPath());
- ;
registryResource = reg.toURI().toURL();
} catch (Throwable t) {
// Ignore
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org