Remerge of M2. All tests pass locally

Testing done in Intelij and mvn command line via windows/cygwin.
Python tests removed from auto build pending Jython-siztion. Tested running broker in intelij and python run-tests from cygwin.

All tests pass. (CombinedTest still exhibts a race condition. but that has always been so.)

Additional Race condition identified (around MsgReject/AutoDeleteQueues) during testing patch to follow.

systests are inconsistent Some use TestableMemoryMessageStore some use MemoryMessgaeStore.

Lets not roll back this change if issues are discovered. Lets work together to go forward and address any issues. I have spent a lot of time ensuring the tests work for me so I hope that they work for you.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@571129 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 103 insertions, 33 deletions

diff --git a/qpid/java/common/pom.xml b/qpid/java/common/pom.xml
index de3fc33e62..d480aecb1b 100644
--- a/qpid/java/common/pom.xml
+++ b/qpid/java/common/pom.xml
@@ -152,15 +152,27 @@
     <dependencies>
 
         <dependency>  
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+
+
+
+        <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>  
+            <artifactId>slf4j-api</artifactId>
             <version>1.4.0</version> 
         </dependency>
 
-        <dependency>  
-            <groupId>org.slf4j</groupId> 
-            <artifactId>slf4j-log4j12</artifactId>  
-            <version>1.4.0</version>  
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.4.0</version>
             <scope>test</scope> 
         </dependency>
 
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java b/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
index 9d8672f433..19f5035e33 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ * 
  *   http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -39,11 +39,8 @@ public class AMQChannelException extends AMQException
 {
     private final int _classId;
     private final int _methodId;
-
-    /** AMQP version for which exception ocurred, major code. */
+    /* AMQP version for which exception ocurred */
     private final byte major;
-
-    /** AMQP version for which exception ocurred, minor code. */
     private final byte minor;
 
     public AMQChannelException(AMQConstant errorCode, String msg, int classId, int methodId, byte major, byte minor,
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 05e9473463..20db907739 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
@@ -26,6 +26,10 @@ import org.apache.mina.common.ByteBuffer;
 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

 

+import java.util.Map;

+import java.util.WeakHashMap;

+import java.lang.ref.WeakReference;

+

 /**

  * A short string is a representation of an AMQ Short String

  * Short strings differ from the Java String class by being limited to on ASCII characters (0-127)

@@ -34,6 +38,19 @@ import org.slf4j.LoggerFactory;
  */

 public final class AMQShortString implements CharSequence, Comparable<AMQShortString>

 {

+

+    private static final ThreadLocal<Map<AMQShortString, WeakReference<AMQShortString>>> _localInternMap =

+            new ThreadLocal<Map<AMQShortString, WeakReference<AMQShortString>>>()

+            {

+                protected Map<AMQShortString, WeakReference<AMQShortString>> initialValue()

+                {

+                    return new WeakHashMap<AMQShortString, WeakReference<AMQShortString>>();

+                };

+            };

+

+    private static final Map<AMQShortString, WeakReference<AMQShortString>> _globalInternMap =

+            new WeakHashMap<AMQShortString, WeakReference<AMQShortString>>();

+

     private static final Logger _logger = LoggerFactory.getLogger(AMQShortString.class);

 

     private final ByteBuffer _data;

@@ -376,4 +393,42 @@ public final class AMQShortString implements CharSequence, Comparable<AMQShortSt
             return (length() == name.length()) ? 0 : -1;

         }

     }

+

+    public AMQShortString intern()

+    {

+

+        hashCode();

+

+        Map<AMQShortString, WeakReference<AMQShortString>> localMap =

+                _localInternMap.get();

+

+        WeakReference<AMQShortString> ref = localMap.get(this);

+        AMQShortString internString;

+

+        if(ref != null)

+        {

+            internString = ref.get();

+            if(internString != null)

+            {

+                return internString;

+            }

+        }

+

+

+        synchronized(_globalInternMap)

+        {

+

+            ref = _globalInternMap.get(this);

+            if((ref == null) || ((internString = ref.get()) == null))

+            {

+                internString = new AMQShortString(getBytes());

+                ref = new WeakReference(internString);

+                _globalInternMap.put(internString, ref);

+            }

+

+        }

+        localMap.put(internString, ref);

+        return internString;

+

+    }

 }

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
index c9e15f18e3..42e2f7ad97 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/MessagePublishInfoConverter.java
@@ -1,18 +1,21 @@
 /*

  *

- * Copyright (c) 2006 The Apache Software Foundation

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

  *

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

+ *   http://www.apache.org/licenses/LICENSE-2.0

  *

- *    http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

  *

  */

 

diff --git a/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
index 52e82cdf07..99588a0908 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/abstraction/ProtocolVersionMethodConverter.java
@@ -1,18 +1,21 @@
 /*

  *

- * Copyright (c) 2006 The Apache Software Foundation

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

  *

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

+ *   http://www.apache.org/licenses/LICENSE-2.0

  *

- *    http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

  *

  */