Author: markt
Date: Thu Dec 9 23:58:20 2010
New Revision: 1044178
URL: http://svn.apache.org/viewvc?rev=1044178&view=rev
Log:
Fix Eclipse warnings in package
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=1044178&r1=1044177&r2=1044178&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Thu
Dec 9 23:58:20 2010
@@ -139,6 +139,7 @@ public class FarmWarDeployer extends Clu
}
/*--Logic---------------------------------------------------*/
+ @Override
public void start() throws Exception {
if (started)
return;
@@ -174,12 +175,8 @@ public class FarmWarDeployer extends Clu
}
configBase = new File(System.getProperty(Globals.CATALINA_BASE_PROP),
"conf");
- if (engine != null) {
- configBase = new File(configBase, engine.getName());
- }
- if (host != null) {
- configBase = new File(configBase, hostname);
- }
+ configBase = new File(configBase, engine.getName());
+ configBase = new File(configBase, hostname);
// Retrieve the MBean server
mBeanServer = Registry.getRegistry(null, null).getMBeanServer();
@@ -198,6 +195,7 @@ public class FarmWarDeployer extends Clu
*
* @see org.apache.catalina.ha.ClusterDeployer#stop()
*/
+ @Override
public void stop() throws LifecycleException {
started = false;
getCluster().removeClusterListener(this);
@@ -367,6 +365,7 @@ public class FarmWarDeployer extends Clu
* if an input/output error was encountered during
* installation
*/
+ @Override
public void install(String contextPath, URL war) throws IOException {
Member[] members = getCluster().getMembers();
Member localMember = getCluster().getLocalMember();
@@ -414,6 +413,7 @@ public class FarmWarDeployer extends Clu
* @exception IOException
* if an input/output error occurs during removal
*/
+ @Override
public void remove(String contextPath, boolean undeploy) throws
IOException {
if (log.isInfoEnabled())
log.info("Cluster wide remove of web app " + contextPath);
@@ -451,6 +451,7 @@ public class FarmWarDeployer extends Clu
*
* @see
org.apache.catalina.ha.deploy.FileChangeListener#fileModified(java.io.File)
*/
+ @Override
public void fileModified(File newWar) {
try {
File deployWar = new File(getDeployDir(), newWar.getName());
@@ -475,6 +476,7 @@ public class FarmWarDeployer extends Clu
*
* @see
org.apache.catalina.ha.deploy.FileChangeListener#fileRemoved(java.io.File)
*/
+ @Override
public void fileRemoved(File removeWar) {
try {
String contextName = getContextName(removeWar);
@@ -581,6 +583,7 @@ public class FarmWarDeployer extends Clu
*
* @see org.apache.catalina.ha.ClusterDeployer#backgroundProcess()
*/
+ @Override
public void backgroundProcess() {
if (started) {
count = (count + 1) % processDeployFrequency;
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java?rev=1044178&r1=1044177&r2=1044178&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java Thu Dec 9
23:58:20 2010
@@ -158,6 +158,7 @@ public class WarWatcher {
* File name filter for war files
*/
protected class WarFilter implements java.io.FilenameFilter {
+ @Override
public boolean accept(File path, String name) {
if (name == null)
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
