Revert "Gjoranv/java9 prep 05"

3 files changed, 3 insertions, 3 deletions

diff --git a/container-search/src/main/java/com/yahoo/fs4/mplex/Backend.java b/container-search/src/main/java/com/yahoo/fs4/mplex/Backend.java
index 81192be035a..556ab6bb78f 100644
--- a/container-search/src/main/java/com/yahoo/fs4/mplex/Backend.java
+++ b/container-search/src/main/java/com/yahoo/fs4/mplex/Backend.java
@@ -261,7 +261,7 @@ public class Backend implements ConnectionFactory {
      *         set of active channels.
      */
     public FS4Channel getChannel (int id) {
-        return getChannel(Integer.valueOf(id));
+        return getChannel(new Integer(id));
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Channel.java b/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Channel.java
index b0fce14e73f..7cab3d59f66 100644
--- a/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Channel.java
+++ b/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Channel.java
@@ -52,7 +52,7 @@ public class FS4Channel
     }
 
     static public FS4Channel createPingChannel(Backend backend) {
-        FS4Channel pingChannel = new FS4Channel(backend, Integer.valueOf(0));
+        FS4Channel pingChannel = new FS4Channel(backend, new Integer(0));
         pingChannel.isPingChannel = true;
         return pingChannel;
     }
diff --git a/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Connection.java b/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Connection.java
index 11e7d4e3d35..2c1bb623ee0 100644
--- a/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Connection.java
+++ b/container-search/src/main/java/com/yahoo/fs4/mplex/FS4Connection.java
@@ -236,7 +236,7 @@ public class FS4Connection implements Connection
                         receiver = backend.getPingChannel();
                 }
                 else {
-                    receiver = backend.getChannel(Integer.valueOf(queryId));
+                    receiver = backend.getChannel(new Integer(queryId));
                 }
                 packet = PacketDecoder.extractPacket(readBuffer);