From 0b577d8ebd8c7a35ad4c84ed1bc048f21bb2d9d6 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Mon, 18 Aug 2014 18:13:09 +0000
Subject: QPID-6014 : [Java] declare variables as ConcurrentMap not
 ConcurrentHashMap to avoid linking issues after compiling under Java 8

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1618690 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/org/apache/qpid/framing/AMQShortString.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'qpid/java/common/src/main')

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
index a06fa2d15b..17735f5c9c 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
@@ -21,15 +21,16 @@
 
 package org.apache.qpid.framing;
 
-import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A short string is a representation of an AMQ Short String
@@ -97,7 +98,7 @@ public final class AMQShortString implements CharSequence, Comparable<AMQShortSt
         return new AMQShortString(_data, from+_offset, to-from);
     }
 
-    private static final ConcurrentHashMap<AMQShortString, AMQShortString> _globalInternMap =
+    private static final ConcurrentMap<AMQShortString, AMQShortString> _globalInternMap =
             new ConcurrentHashMap<AMQShortString, AMQShortString>();
 
     private static final Logger _logger = LoggerFactory.getLogger(AMQShortString.class);
-- 
cgit v1.2.1