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/10 15:24:23 UTC
qpid-broker-j git commit: QPID-7830: [Broker-J] Fix failing test
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 2696d7a54 -> 196b27065
QPID-7830: [Broker-J] Fix failing test
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/196b2706
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/196b2706
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/196b2706
Branch: refs/heads/master
Commit: 196b27065219b1283522bdb3a8f4fb1dda82ac16
Parents: 2696d7a
Author: Alex Rudyy <or...@apache.org>
Authored: Thu May 10 16:13:40 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Thu May 10 16:13:40 2018 +0100
----------------------------------------------------------------------
.../apache/qpid/server/protocol/v0_8/AMQShortString.java | 2 +-
.../qpid/server/protocol/v0_8/AMQShortStringTest.java | 9 +++++++--
.../server/protocol/v0_10/transport/AbstractDecoder.java | 2 +-
.../server/protocol/v0_10/transport/AbstractEncoder.java | 2 +-
.../qpid/server/protocol/v0_10/transport/BBDecoderTest.java | 4 +++-
.../qpid/server/protocol/v0_10/transport/BBEncoderTest.java | 2 ++
6 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/196b2706/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/196b2706/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 f33102f..38f5ac2 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
@@ -27,8 +27,10 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
+import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import org.junit.Test;
@@ -157,7 +159,9 @@ public class AMQShortStringTest extends UnitTestBase
@Test
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
{
@@ -173,7 +177,8 @@ public class AMQShortStringTest extends UnitTestBase
}
finally
{
- AMQShortString.setCache(null);
+ cache.cleanUp();
+ AMQShortString.setCache(original);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/196b2706/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/196b2706/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/196b2706/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 4d8a508..8f083b9 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
@@ -46,7 +46,8 @@ public class BBDecoderTest extends UnitTestBase
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);
@@ -61,6 +62,7 @@ public class BBDecoderTest extends UnitTestBase
finally
{
cache.cleanUp();
+ BBDecoder.setStringCache(original);
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/196b2706/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 2decc60..d57d2f2 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
@@ -134,6 +134,7 @@ public class BBEncoderTest extends UnitTestBase
public void encodedStr8Caching()
{
String testString = "Test";
+ Cache< String, byte[]> original = BBEncoder.getEncodedStringCache();
Cache< String, byte[]> cache = CacheBuilder.newBuilder().maximumSize(2).build();
try
{
@@ -147,6 +148,7 @@ public class BBEncoderTest extends UnitTestBase
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