Author: painter
Date: Wed Mar 20 14:50:06 2019
New Revision: 1855912
URL: http://svn.apache.org/viewvc?rev=1855912&view=rev
Log:
Clear findbug report
Modified:
turbine/fulcrum/trunk/intake/src/changes/changes.xml
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
Modified: turbine/fulcrum/trunk/intake/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/changes/changes.xml?rev=1855912&r1=1855911&r2=1855912&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/intake/src/changes/changes.xml Wed Mar 20 14:50:06
2019
@@ -26,6 +26,12 @@
<body>
<release version="2.0.0" date="in Subversion">
+ <action dev="painter" type="update">
+ Update to yaafi 1.0.8, testcontainer 1.0.8
+ </action>
+ <action dev="painter" type="update">
+ Derive from Turbine parent POM 5
+ </action>
<action dev="tv" type="update">
Move Field creation to typesafe enum
</action>
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java?rev=1855912&r1=1855911&r2=1855912&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
Wed Mar 20 14:50:06 2019
@@ -237,13 +237,17 @@ public class IntakeServiceImpl extends A
}
else
{
- // Maybe an old file from intake. Ignore it and try to delete
- getLogger().info(
- "serialized object is not an intake map, ignoring");
+ // This could be old file from intake. Try to delete it
+ getLogger().info("serialized object is not an intake map,
ignoring");
in.close();
in = null;
- serialDataFile.delete(); // Try to delete the file lying
- // around
+
+ // Try to delete the file
+ boolean result = serialDataFile.delete();
+ if ( result == false )
+ {
+ getLogger().error("Unknown serialized file could not be
removed");
+ }
}
}
catch (IOException e)
@@ -334,8 +338,19 @@ public class IntakeServiceImpl extends A
try
{
- serialData.createNewFile();
- serialData.delete();
+ boolean result = serialData.createNewFile();
+ if ( result == false )
+ {
+ getLogger().error("Could not create new serialized file");
+ }
+
+ // Try to delete the file
+ result = serialData.delete();
+ if ( result == false )
+ {
+ getLogger().error("Serialized file could not be removed");
+ }
+
}
catch (IOException e)
{
