From ae004b5331c5c847c0b102c28587bf14d0af05c0 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Fri, 13 Feb 2009 09:11:42 +0000 Subject: [PATCH] Fixed some problems reported by Find Bugs (mostly to shut it up) --- .../netty/servlet/ServletChannelHandler.java | 15 ++++++++------- .../org/jboss/netty/util/ConcurrentHashMap.java | 11 +++-------- .../netty/util/ConcurrentIdentityHashMap.java | 9 +++------ .../util/ConcurrentIdentityWeakKeyHashMap.java | 11 +++-------- .../netty/util/ConcurrentWeakKeyHashMap.java | 13 ++++--------- 5 files changed, 21 insertions(+), 38 deletions(-) diff --git a/src/main/java/org/jboss/netty/servlet/ServletChannelHandler.java b/src/main/java/org/jboss/netty/servlet/ServletChannelHandler.java index e86bb3efa4..c051f1d1f7 100644 --- a/src/main/java/org/jboss/netty/servlet/ServletChannelHandler.java +++ b/src/main/java/org/jboss/netty/servlet/ServletChannelHandler.java @@ -79,14 +79,15 @@ class ServletChannelHandler extends SimpleChannelHandler { ChannelBuffer buffer = (ChannelBuffer) e.getMessage(); if (stream) { + byte[] b = null; reconnectLock.lock(); - if (outputStream == null) { - awaitingEvents.add(e); - return; - } - byte[] b = new byte[buffer.readableBytes()]; - buffer.readBytes(b); try { + if (outputStream == null) { + awaitingEvents.add(e); + return; + } + b = new byte[buffer.readableBytes()]; + buffer.readBytes(b); outputStream.write(b); outputStream.flush(); e.getFuture().setSuccess(); @@ -175,8 +176,8 @@ class ServletChannelHandler extends SimpleChannelHandler { public boolean awaitReconnect() { reconnectLock.lock(); - connected = false; try { + connected = false; reconnectCondition.await(reconnectTimeout, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { diff --git a/src/main/java/org/jboss/netty/util/ConcurrentHashMap.java b/src/main/java/org/jboss/netty/util/ConcurrentHashMap.java index 417935c952..e9810a3bba 100644 --- a/src/main/java/org/jboss/netty/util/ConcurrentHashMap.java +++ b/src/main/java/org/jboss/netty/util/ConcurrentHashMap.java @@ -27,7 +27,6 @@ */ package org.jboss.netty.util; -import java.io.Serializable; import java.util.AbstractCollection; import java.util.AbstractMap; import java.util.AbstractSet; @@ -245,7 +244,7 @@ public final class ConcurrentHashMap extends AbstractMap /** * The number of elements in this segment's region. */ - volatile int count; + transient volatile int count; /** * Number of updates that alter the size of the table. This is used @@ -265,7 +264,7 @@ public final class ConcurrentHashMap extends AbstractMap /** * The per-segment table. */ - volatile HashEntry[] table; + transient volatile HashEntry[] table; /** * The load factor for the hash table. Even though this value is same @@ -1225,9 +1224,7 @@ public final class ConcurrentHashMap extends AbstractMap /* * This class is needed for JDK5 compatibility. */ - static class SimpleEntry implements Entry, Serializable { - - private static final long serialVersionUID = -7482812091037709145L; + static class SimpleEntry implements Entry { private final K key; @@ -1290,8 +1287,6 @@ public final class ConcurrentHashMap extends AbstractMap */ final class WriteThroughEntry extends SimpleEntry { - private static final long serialVersionUID = 7779181742399903646L; - WriteThroughEntry(K k, V v) { super(k, v); } diff --git a/src/main/java/org/jboss/netty/util/ConcurrentIdentityHashMap.java b/src/main/java/org/jboss/netty/util/ConcurrentIdentityHashMap.java index 2037e0ade9..d8c5111615 100644 --- a/src/main/java/org/jboss/netty/util/ConcurrentIdentityHashMap.java +++ b/src/main/java/org/jboss/netty/util/ConcurrentIdentityHashMap.java @@ -27,7 +27,6 @@ */ package org.jboss.netty.util; -import java.io.Serializable; import java.util.AbstractCollection; import java.util.AbstractMap; import java.util.AbstractSet; @@ -245,7 +244,7 @@ public final class ConcurrentIdentityHashMap extends AbstractMap /** * The number of elements in this segment's region. */ - volatile int count; + transient volatile int count; /** * Number of updates that alter the size of the table. This is used @@ -265,7 +264,7 @@ public final class ConcurrentIdentityHashMap extends AbstractMap /** * The per-segment table. */ - volatile HashEntry[] table; + transient volatile HashEntry[] table; /** * The load factor for the hash table. Even though this value is same @@ -1225,7 +1224,7 @@ public final class ConcurrentIdentityHashMap extends AbstractMap /* * This class is needed for JDK5 compatibility. */ - static class SimpleEntry implements Entry, Serializable { + static class SimpleEntry implements Entry { private static final long serialVersionUID = -8144765946475398746L; @@ -1290,8 +1289,6 @@ public final class ConcurrentIdentityHashMap extends AbstractMap */ final class WriteThroughEntry extends SimpleEntry { - private static final long serialVersionUID = 6097929717041808840L; - WriteThroughEntry(K k, V v) { super(k, v); } diff --git a/src/main/java/org/jboss/netty/util/ConcurrentIdentityWeakKeyHashMap.java b/src/main/java/org/jboss/netty/util/ConcurrentIdentityWeakKeyHashMap.java index f6fc198d63..3cf0f3fdaa 100644 --- a/src/main/java/org/jboss/netty/util/ConcurrentIdentityWeakKeyHashMap.java +++ b/src/main/java/org/jboss/netty/util/ConcurrentIdentityWeakKeyHashMap.java @@ -27,7 +27,6 @@ */ package org.jboss.netty.util; -import java.io.Serializable; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; @@ -284,7 +283,7 @@ public final class ConcurrentIdentityWeakKeyHashMap extends AbstractMap extends AbstractMap[] table; + transient volatile HashEntry[] table; /** * The load factor for the hash table. Even though this value is same @@ -1305,9 +1304,7 @@ public final class ConcurrentIdentityWeakKeyHashMap extends AbstractMap implements Entry, Serializable { - - private static final long serialVersionUID = 8931408205638274090L; + static class SimpleEntry implements Entry { private final K key; @@ -1370,8 +1367,6 @@ public final class ConcurrentIdentityWeakKeyHashMap extends AbstractMap { - private static final long serialVersionUID = 4475636861021292972L; - WriteThroughEntry(K k, V v) { super(k, v); } diff --git a/src/main/java/org/jboss/netty/util/ConcurrentWeakKeyHashMap.java b/src/main/java/org/jboss/netty/util/ConcurrentWeakKeyHashMap.java index f166d1e5e0..9178136fd5 100644 --- a/src/main/java/org/jboss/netty/util/ConcurrentWeakKeyHashMap.java +++ b/src/main/java/org/jboss/netty/util/ConcurrentWeakKeyHashMap.java @@ -27,7 +27,6 @@ */ package org.jboss.netty.util; -import java.io.Serializable; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; @@ -284,7 +283,7 @@ public final class ConcurrentWeakKeyHashMap extends AbstractMap impl /** * The number of elements in this segment's region. */ - volatile int count; + transient volatile int count; /** * Number of updates that alter the size of the table. This is used @@ -304,7 +303,7 @@ public final class ConcurrentWeakKeyHashMap extends AbstractMap impl /** * The per-segment table. */ - volatile HashEntry[] table; + transient volatile HashEntry[] table; /** * The load factor for the hash table. Even though this value is same @@ -319,7 +318,7 @@ public final class ConcurrentWeakKeyHashMap extends AbstractMap impl * The collected weak-key reference queue for this segment. This should * be (re)initialized whenever table is assigned, */ - volatile ReferenceQueue refQueue; + transient volatile ReferenceQueue refQueue; Segment(int initialCapacity, float lf) { loadFactor = lf; @@ -1305,9 +1304,7 @@ public final class ConcurrentWeakKeyHashMap extends AbstractMap impl /* * This class is needed for JDK5 compatibility. */ - static class SimpleEntry implements Entry, Serializable { - - private static final long serialVersionUID = -2743063770440054676L; + static class SimpleEntry implements Entry { private final K key; @@ -1370,8 +1367,6 @@ public final class ConcurrentWeakKeyHashMap extends AbstractMap impl */ final class WriteThroughEntry extends SimpleEntry { - private static final long serialVersionUID = 856037622737854185L; - WriteThroughEntry(K k, V v) { super(k, v); }