Author: hyunsik
Date: Fri Jul 6 10:25:28 2012
New Revision: 1358106
URL: http://svn.apache.org/viewvc?rev=1358106&view=rev
Log:
GIRAPH-233: Small errors found by FindBugs. Contributed by Jan van der Lugt.
Modified:
giraph/trunk/CHANGELOG
giraph/trunk/src/main/java/org/apache/giraph/comm/NettyServer.java
giraph/trunk/src/main/java/org/apache/giraph/comm/RequestRegistry.java
giraph/trunk/src/main/java/org/apache/giraph/comm/ResponseClientHandler.java
giraph/trunk/src/main/java/org/apache/giraph/graph/LongDoubleFloatDoubleVertex.java
giraph/trunk/src/main/java/org/apache/giraph/utils/EmptyIterable.java
giraph/trunk/src/main/java/org/apache/giraph/zk/ZooKeeperExt.java
giraph/trunk/src/test/java/org/apache/giraph/TestZooKeeperExt.java
Modified: giraph/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1358106&r1=1358105&r2=1358106&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Fri Jul 6 10:25:28 2012
@@ -2,6 +2,8 @@ Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-233: Small errors found by FindBugs (Jan van der Lugt via hyunsik)
+
GIRAPH-216: NullWritable as VertexData, EdgeData or MessageData should be
allowed.
(Jan van der Lugt via jghoman)
Modified: giraph/trunk/src/main/java/org/apache/giraph/comm/NettyServer.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/NettyServer.java?rev=1358106&r1=1358105&r2=1358106&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/NettyServer.java
(original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/NettyServer.java Fri Jul
6 10:25:28 2012
@@ -97,7 +97,7 @@ public class NettyServer<I extends Writa
new SendPartitionMessagesRequest<I, V, E, M>());
requestRegistry.registerClass(
new SendPartitionMutationsRequest<I, V, E, M>());
- requestRegistry.finalize();
+ requestRegistry.shutdown();
ThreadFactory bossFactory = new ThreadFactoryBuilder()
.setNameFormat("Giraph Netty Boss #%d")
Modified: giraph/trunk/src/main/java/org/apache/giraph/comm/RequestRegistry.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/RequestRegistry.java?rev=1358106&r1=1358105&r2=1358106&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/comm/RequestRegistry.java
(original)
+++ giraph/trunk/src/main/java/org/apache/giraph/comm/RequestRegistry.java Fri
Jul 6 10:25:28 2012
@@ -30,7 +30,7 @@ public class RequestRegistry {
private final Map<Type, Class<? extends WritableRequest>> requestMap =
new EnumMap<Type, Class<? extends WritableRequest>>(Type.class);
/** If finalized, nothing can be added. */
- private boolean finalized = false;
+ private boolean shutdown = false;
/**
* Type of the request
@@ -50,9 +50,9 @@ public class RequestRegistry {
* @param writableRequest Request to be registered.
*/
public void registerClass(WritableRequest<?, ?, ?, ?> writableRequest) {
- if (finalized) {
+ if (shutdown) {
throw new IllegalStateException(
- "registerClass: Cannot call this after finalization!");
+ "registerClass: Cannot call this after shutting down!");
}
if (requestMap.put(writableRequest.getType(),
writableRequest.getClass()) != null) {
@@ -69,7 +69,7 @@ public class RequestRegistry {
*/
@SuppressWarnings("rawtypes")
public Class<? extends WritableRequest> getClass(Type type) {
- if (!finalized) {
+ if (!shutdown) {
throw new IllegalStateException(
"getClass: Illegal to get class before finalized");
}
@@ -87,7 +87,7 @@ public class RequestRegistry {
/**
* No more requests can be registered.
*/
- public void finalize() {
- finalized = true;
+ public void shutdown() {
+ shutdown = true;
}
}
Modified:
giraph/trunk/src/main/java/org/apache/giraph/comm/ResponseClientHandler.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/comm/ResponseClientHandler.java?rev=1358106&r1=1358105&r2=1358106&view=diff
==============================================================================
---
giraph/trunk/src/main/java/org/apache/giraph/comm/ResponseClientHandler.java
(original)
+++
giraph/trunk/src/main/java/org/apache/giraph/comm/ResponseClientHandler.java
Fri Jul 6 10:25:28 2012
@@ -57,16 +57,25 @@ public class ResponseClientHandler exten
ChannelBuffer buffer = (ChannelBuffer) event.getMessage();
ChannelBufferInputStream inputStream = new
ChannelBufferInputStream(buffer);
int response = -1;
- for (int i = 0; i < buffer.capacity(); ++i) {
+ try {
+ for (int i = 0; i < buffer.capacity(); ++i) {
+ try {
+ response = inputStream.readByte();
+ } catch (IOException e) {
+ throw new IllegalStateException(
+ "messageReceived: Got IOException ", e);
+ }
+ if (response != 0) {
+ throw new IllegalStateException(
+ "messageReceived: Got illegal response " + response);
+ }
+ }
+ } finally {
try {
- response = inputStream.readByte();
+ inputStream.close();
} catch (IOException e) {
throw new IllegalStateException("messageReceived: Got IOException ",
e);
}
- if (response != 0) {
- throw new IllegalStateException(
- "messageReceived: Got illegal response " + response);
- }
}
synchronized (waitingRequestCount) {
Modified:
giraph/trunk/src/main/java/org/apache/giraph/graph/LongDoubleFloatDoubleVertex.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/graph/LongDoubleFloatDoubleVertex.java?rev=1358106&r1=1358105&r2=1358106&view=diff
==============================================================================
---
giraph/trunk/src/main/java/org/apache/giraph/graph/LongDoubleFloatDoubleVertex.java
(original)
+++
giraph/trunk/src/main/java/org/apache/giraph/graph/LongDoubleFloatDoubleVertex.java
Fri Jul 6 10:25:28 2012
@@ -283,7 +283,7 @@ public abstract class LongDoubleFloatDou
/**
* Helper iterable over the messages.
*/
- private class UnmodifiableDoubleWritableIterable
+ private static class UnmodifiableDoubleWritableIterable
implements Iterable<DoubleWritable> {
/** Backing store of messages */
private final DoubleArrayList elementList;
@@ -308,7 +308,7 @@ public abstract class LongDoubleFloatDou
/**
* Iterator over the messages.
*/
- private class UnmodifiableDoubleWritableIterator
+ private static class UnmodifiableDoubleWritableIterator
extends UnmodifiableIterator<DoubleWritable> {
/** Double backing list */
private final DoubleArrayList elementList;
Modified: giraph/trunk/src/main/java/org/apache/giraph/utils/EmptyIterable.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/utils/EmptyIterable.java?rev=1358106&r1=1358105&r2=1358106&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/utils/EmptyIterable.java
(original)
+++ giraph/trunk/src/main/java/org/apache/giraph/utils/EmptyIterable.java Fri
Jul 6 10:25:28 2012
@@ -19,6 +19,7 @@
package org.apache.giraph.utils;
import java.util.Iterator;
+import java.util.NoSuchElementException;
/**
* Helper empty iterable when there are no messages.
@@ -38,7 +39,7 @@ public class EmptyIterable<M> implements
@Override
public M next() {
- return null;
+ throw new NoSuchElementException();
}
@Override
Modified: giraph/trunk/src/main/java/org/apache/giraph/zk/ZooKeeperExt.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/zk/ZooKeeperExt.java?rev=1358106&r1=1358105&r2=1358106&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/zk/ZooKeeperExt.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/zk/ZooKeeperExt.java Fri Jul
6 10:25:28 2012
@@ -121,7 +121,7 @@ public class ZooKeeperExt extends ZooKee
/**
* Data structure for handling the output of createOrSet()
*/
- public class PathStat {
+ public static class PathStat {
/** Path to created znode (if any) */
private String path;
/** Stat from set znode (if any) */
Modified: giraph/trunk/src/test/java/org/apache/giraph/TestZooKeeperExt.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/TestZooKeeperExt.java?rev=1358106&r1=1358105&r2=1358106&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/TestZooKeeperExt.java
(original)
+++ giraph/trunk/src/test/java/org/apache/giraph/TestZooKeeperExt.java Fri Jul
6 10:25:28 2012
@@ -39,8 +39,8 @@ public class TestZooKeeperExt implements
/** ZooKeeper server list */
private String zkList = System.getProperty("prop.zookeeper.list");
- public final String BASE_PATH = "/_zooKeeperExtTest";
- public final String FIRST_PATH = "/_first";
+ public static final String BASE_PATH = "/_zooKeeperExtTest";
+ public static final String FIRST_PATH = "/_first";
public void process(WatchedEvent event) {
return;
