diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/DefaultModifierRegistry.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/DefaultModifierRegistry.java index 733949524..a7ab9a485 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/DefaultModifierRegistry.java +++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/DefaultModifierRegistry.java @@ -146,7 +146,7 @@ public class DefaultModifierRegistry implements ModifierRegistry { MemcachedClientModifier memcachedClientModifier = new MemcachedClientModifier(byteCodeInstrumentor, agent); addModifier(memcachedClientModifier); - FrontCacheMemcachedClientModifier frontCacheMemcachedClientModifier = new FrontCacheMemcachedClientModifier(byteCodeInstrumentor, agent); +// FrontCacheMemcachedClientModifier frontCacheMemcachedClientModifier = new FrontCacheMemcachedClientModifier(byteCodeInstrumentor, agent); // 관련 수정에 사이드 이펙트가 있이서 일단 disable함. // addModifier(frontCacheMemcachedClientModifier); @@ -169,7 +169,7 @@ public class DefaultModifierRegistry implements ModifierRegistry { OperationFutureModifier operationFutureModifier = new OperationFutureModifier(byteCodeInstrumentor, agent); addModifier(operationFutureModifier); - FrontCacheGetFutureModifier frontCacheGetFutureModifier = new FrontCacheGetFutureModifier(byteCodeInstrumentor, agent); +// FrontCacheGetFutureModifier frontCacheGetFutureModifier = new FrontCacheGetFutureModifier(byteCodeInstrumentor, agent); // 관련 수정에 사이드 이펙트가 있이서 일단 disable함. // addModifier(frontCacheGetFutureModifier); diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/HeaderTBaseSerializer.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/HeaderTBaseSerializer.java index 024098eb6..b9995b87e 100644 --- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/HeaderTBaseSerializer.java +++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/HeaderTBaseSerializer.java @@ -17,6 +17,8 @@ import org.apache.thrift.transport.TIOStreamTransport; */ public class HeaderTBaseSerializer { + private static final String UTF8 = "UTF8"; + private final ByteArrayOutputStream baos; private final TProtocol protocol; private final TBaseLocator locator; @@ -61,14 +63,14 @@ public class HeaderTBaseSerializer { } /** - * Serialize the Thrift object into a Java string, using the default JVM + * Serialize the Thrift object into a Java string, using the UTF8 * charset encoding. * * @param base The object to serialize * @return Serialized object as a String */ public String toString(TBase base) throws TException { - return new String(serialize(base)); + return toString(base, UTF8); } /** diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/L4Packet.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/L4Packet.java index 4d1626281..0b608b115 100644 --- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/L4Packet.java +++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/L4Packet.java @@ -10,7 +10,7 @@ import org.apache.thrift.protocol.TProtocol; */ public class L4Packet implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private final Header header; + private final transient Header header; public L4Packet(Header header) { this.header = header; diff --git a/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/NetworkAvailabilityCheckPacket.java b/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/NetworkAvailabilityCheckPacket.java index c46c1cc60..03a9291c0 100644 --- a/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/NetworkAvailabilityCheckPacket.java +++ b/thrift/src/main/java/com/navercorp/pinpoint/thrift/io/NetworkAvailabilityCheckPacket.java @@ -5,6 +5,8 @@ import org.apache.thrift.TException; import org.apache.thrift.TFieldIdEnum; import org.apache.thrift.protocol.TProtocol; +import java.io.UnsupportedEncodingException; + /** * @author netspider */ @@ -12,8 +14,19 @@ public class NetworkAvailabilityCheckPacket implements org.apache.thrift.TBase