You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/05/24 16:24:40 UTC
[2/4] qpid-broker-j git commit: QPID-7830: [Broker-J] Fix failing test
QPID-7830: [Broker-J] Fix failing test
(cherry picked from commit 196b27065219b1283522bdb3a8f4fb1dda82ac16)
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/28e73f3c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/28e73f3c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/28e73f3c
Branch: refs/heads/7.0.x
Commit: 28e73f3c1abad32d69d4e2f0937f1021a3ac61dd
Parents: 7b675cb
Author: Alex Rudyy <or...@apache.org>
Authored: Thu May 10 16:13:40 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Thu May 24 16:43:41 2018 +0100
----------------------------------------------------------------------
.../apache/qpid/server/protocol/v0_8/AMQShortString.java | 2 +-
.../qpid/server/protocol/v0_8/AMQShortStringTest.java | 10 ++++++++--
.../server/protocol/v0_10/transport/AbstractDecoder.java | 2 +-
.../server/protocol/v0_10/transport/AbstractEncoder.java | 2 +-
.../server/protocol/v0_10/transport/BBDecoderTest.java | 4 +++-
.../server/protocol/v0_10/transport/BBEncoderTest.java | 2 ++
6 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/28e73f3c/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
index d0cf604..a01c02f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQShortString.java
@@ -359,7 +359,7 @@ public final class AMQShortString implements Comparable<AMQShortString>
return amqShortString == null ? null : amqShortString.toString();
}
- private static Cache<ByteBuffer, AMQShortString> getShortStringCache()
+ static Cache<ByteBuffer, AMQShortString> getShortStringCache()
{
return CACHE.get();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/28e73f3c/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java b/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java
index 7d29b5b..d5ea2de 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQShortStringTest.java
@@ -20,8 +20,11 @@
package org.apache.qpid.server.protocol.v0_8;
+import java.nio.ByteBuffer;
+
import java.nio.charset.StandardCharsets;
+import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -134,7 +137,9 @@ public class AMQShortStringTest extends QpidTestCase
public void testInterning()
{
- AMQShortString.setCache(CacheBuilder.newBuilder().maximumSize(1).build());
+ Cache<ByteBuffer, AMQShortString> original = AMQShortString.getShortStringCache();
+ Cache<ByteBuffer, AMQShortString> cache = CacheBuilder.newBuilder().maximumSize(1).build();
+ AMQShortString.setCache(cache);
try
{
@@ -150,7 +155,8 @@ public class AMQShortStringTest extends QpidTestCase
}
finally
{
- AMQShortString.setCache(null);
+ cache.cleanUp();
+ AMQShortString.setCache(original);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/28e73f3c/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractDecoder.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractDecoder.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractDecoder.java
index 9b8d31f..8a3ff62 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractDecoder.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractDecoder.java
@@ -475,7 +475,7 @@ public abstract class AbstractDecoder implements Decoder
}
}
- private static Cache<Binary, String> getStringCache()
+ static Cache<Binary, String> getStringCache()
{
return CACHE.get();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/28e73f3c/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractEncoder.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractEncoder.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractEncoder.java
index 8f6a631..4bfda93 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractEncoder.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/transport/AbstractEncoder.java
@@ -569,7 +569,7 @@ public abstract class AbstractEncoder implements Encoder
}
}
- private static Cache<String, byte[]> getEncodedStringCache()
+ static Cache<String, byte[]> getEncodedStringCache()
{
return CACHE.get();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/28e73f3c/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoderTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoderTest.java b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoderTest.java
index 3cb0bcc..b1ffca2 100644
--- a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoderTest.java
+++ b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBDecoderTest.java
@@ -43,7 +43,8 @@ public class BBDecoderTest extends QpidTestCase
BBDecoder decoder = new BBDecoder();
decoder.init(buffer);
- Cache<Binary, String> cache = CacheBuilder.newBuilder().maximumSize(1).build();
+ Cache<Binary, String> original = BBDecoder.getStringCache();
+ Cache<Binary, String> cache = CacheBuilder.newBuilder().maximumSize(2).build();
try
{
BBDecoder.setStringCache(cache);
@@ -58,6 +59,7 @@ public class BBDecoderTest extends QpidTestCase
finally
{
cache.cleanUp();
+ BBDecoder.setStringCache(original);
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/28e73f3c/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java
index 480f15a..1de97d3 100644
--- a/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java
+++ b/broker-plugins/amqp-0-10-protocol/src/test/java/org/apache/qpid/server/protocol/v0_10/transport/BBEncoderTest.java
@@ -117,6 +117,7 @@ public class BBEncoderTest extends QpidTestCase
public void testEncodedStr8Caching()
{
String testString = "Test";
+ Cache< String, byte[]> original = BBEncoder.getEncodedStringCache();
Cache< String, byte[]> cache = CacheBuilder.newBuilder().maximumSize(2).build();
try
{
@@ -130,6 +131,7 @@ public class BBEncoderTest extends QpidTestCase
finally
{
cache.cleanUp();
+ BBEncoder.setEncodedStringCache(original);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org