From 4e7814f716bba02a2eb1d71f61a95d081b035346 Mon Sep 17 00:00:00 2001
From: gaurav gupta <gaugupt3@cisco.com>
Date: Wed, 10 Aug 2016 16:43:03 -0700
Subject: [PATCH] Made byteArrayCoder final static

---
 .../build-tools/src/main/resources/beam/findbugs-filter.xml | 6 ------
 .../src/main/java/org/apache/beam/sdk/util/BitSetCoder.java | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml b/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
index 1ad79880772b..d135cbb671d9 100644
--- a/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
+++ b/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
@@ -109,12 +109,6 @@
     <Bug pattern="SE_BAD_FIELD"/>
     <!--[BEAM-412] Non-transient non-serializable instance field in serializable class-->
   </Match>
-  <Match>
-    <Class name="org.apache.beam.sdk.util.BitSetCoder"/>
-    <Field name="byteArrayCoder"/>
-    <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
-    <!--[BEAM-418] Transient field that isn't set by deserialization. -->
-  </Match>
   <Match>
     <Class name="org.apache.beam.sdk.util.CombineFnUtil$NonSerializableBoundedKeyedCombineFn"/>
     <Field name="context"/>
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BitSetCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BitSetCoder.java
index 82c5f51c63d6..b406b1a56cc5 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BitSetCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BitSetCoder.java
@@ -32,7 +32,7 @@
 class BitSetCoder extends AtomicCoder<BitSet> {
 
   private static final BitSetCoder INSTANCE = new BitSetCoder();
-  private transient ByteArrayCoder byteArrayCoder = ByteArrayCoder.of();
+  private static final ByteArrayCoder byteArrayCoder = ByteArrayCoder.of();
 
   private BitSetCoder() {}