Changeset 1134 for OAIHarvester

Timestamp:

02/17/11 13:15:45 (13 years ago)

Author:

oschonef

Message:

• fix some bugs noted by findbugs

Location:

OAIHarvester/trunk/OAIHarvester/src

Files:

• main/java/eu/clarin/cmdi/oai/harvester/impl/Response.java (modified) (3 diffs)
• test/java/eu/clarin/cmdi/oai/harvester/HarvesterTest.java (modified) (1 diff)

OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/Response.java

@@ -22 +22 @@
 
 final class Response {
-    private final class CountingInputStream extends FilterInputStream {
+    private static final class CountingInputStream extends FilterInputStream {
         private long count = 0;
 
@@ -69 +69 @@
     private final HttpEntity entity;
     private final long now = System.currentTimeMillis();
-    private CountingInputStream stream; 
-    private XMLStreamReader reader;
+    private final CountingInputStream stream; 
+    private final XMLStreamReader reader;
 
     Response(HarvestJobImpl job, HttpEntity entity, AbstractHarvester harvester)
@@ -125 +125 @@
         job.addToProcessingTime(System.currentTimeMillis() - now);
         job.addToBytesTransferred(stream.getByteCount());
-        if (reader != null) {
-            try {
-                reader.close();
-            } catch (XMLStreamException e) {
-                /* IGNORE */
-            }
-        }
-        if (stream != null) {
-            try {
-                stream.close();
-            } catch (IOException e) {
-                /* IGNORE */
-            }
+        try {
+            reader.close();
+        } catch (XMLStreamException e) {
+            /* IGNORE */
+        }
+        try {
+            stream.close();
+        } catch (IOException e) {
+            /* IGNORE */
         }
         try {

OAIHarvester/trunk/OAIHarvester/src/test/java/eu/clarin/cmdi/oai/harvester/HarvesterTest.java

@@ -27 +27 @@
         XMLOutputFactory.newInstance();
 
-    private class MyHarvestHandler extends HarvestHandlerAdapter {
+    private static class MyHarvestHandler extends HarvestHandlerAdapter {
         private ZipOutputStream output;
         private int reqNum;