Author: markt
Date: Sat Jan 15 14:00:20 2011
New Revision: 1059337
URL: http://svn.apache.org/viewvc?rev=1059337&view=rev
Log:
Fix FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
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=1059337&r1=1059336&r2=1059337&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Sat
Jan 15 14:00:20 2011
@@ -732,7 +732,7 @@ public class FarmWarDeployer extends Clu
try {
if (!to.exists()) {
if (!to.createNewFile()) {
- log.error(sm.getString("farmWarDeployer.fileNewFail", to));
+ log.error(sm.getString("fileNewFail", to));
return false;
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java?rev=1059337&r1=1059336&r2=1059337&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java Sat
Jan 15 14:00:20 2011
@@ -29,6 +29,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.HexUtils;
+import org.apache.tomcat.util.res.StringManager;
/**
* This factory is used to read files and write files by splitting them up into
@@ -47,6 +48,8 @@ import org.apache.tomcat.util.buf.HexUti
public class FileMessageFactory {
/*--Static Variables----------------------------------------*/
private static final Log log = LogFactory.getLog(FileMessageFactory.class);
+ private static final StringManager sm =
+ StringManager.getManager(Constants.Package);
/**
* The number of bytes that we read from file
@@ -144,7 +147,9 @@ public class FileMessageFactory {
log.debug("open file " + f + " write " + openForWrite);
if (openForWrite) {
if (!file.exists())
- file.createNewFile();
+ if (!file.createNewFile()) {
+ throw new IOException(sm.getString("fileNewFail", file));
+ }
out = new FileOutputStream(f);
} else {
size = file.length();
@@ -238,7 +243,7 @@ public class FileMessageFactory {
+ " war: "
+ msg.getFileName()
+ " data: "
- + msg.getData()
+ + HexUtils.toHexString(msg.getData())
+ " data length: " + msg.getDataLength() + " ]");
return false;
}
@@ -252,7 +257,7 @@ public class FileMessageFactory {
+ " war: "
+ msg.getFileName()
+ " data: "
- + msg.getData()
+ + HexUtils.toHexString(msg.getData())
+ " data length: " + msg.getDataLength() + " ]");
return false;
}
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties?rev=1059337&r1=1059336&r2=1059337&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties Sat
Jan 15 14:00:20 2011
@@ -13,10 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+fileNewFail=Unable to create [{0}]
+
farmWarDeployer.deleteFail=Failed to delete [{0}]
farmWarDeployer.deployEnd=Deployment from [{0}] finished.
farmWarDeployer.fileCopyFail=Unable to copy from [{0}] to [{1}]
-farmWarDeployer.fileNewFail=Unable to create [{0}]
farmWarDeployer.hostOnly=FarmWarDeployer can only work as host cluster
subelement!
farmWarDeployer.hostParentEngine=FarmWarDeployer can only work if parent of
[{0}] is an engine!
farmWarDeployer.mbeanNameFail=Can't construct MBean object name for engine
[{0}] and host [{1}]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
