From 6b1428950ca010f866c577e11baae6965959e005 Mon Sep 17 00:00:00 2001
From: Jongho Moon <jongho.moon@navercorp.com>
Date: Tue, 23 Jun 2015 11:23:32 +0900
Subject: [PATCH] Fixed hasField() bug.

---
 .../pinpoint/profiler/interceptor/bci/JavaAssistClass.java  | 6 +++---
 .../navercorp/pinpoint/profiler/util/JavaAssistUtils.java   | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/interceptor/bci/JavaAssistClass.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/interceptor/bci/JavaAssistClass.java
index a7da43499..5a48f4260 100644
--- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/interceptor/bci/JavaAssistClass.java
+++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/interceptor/bci/JavaAssistClass.java
@@ -38,10 +38,10 @@ import com.navercorp.pinpoint.bootstrap.context.TraceContext;
 import com.navercorp.pinpoint.bootstrap.instrument.DefaultInterceptorGroupDefinition;
 import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass;
 import com.navercorp.pinpoint.bootstrap.instrument.InstrumentException;
+import com.navercorp.pinpoint.bootstrap.instrument.InterceptorGroupDefinition;
 import com.navercorp.pinpoint.bootstrap.instrument.MethodFilter;
 import com.navercorp.pinpoint.bootstrap.instrument.MethodInfo;
 import com.navercorp.pinpoint.bootstrap.instrument.NotFoundInstrumentException;
-import com.navercorp.pinpoint.bootstrap.instrument.InterceptorGroupDefinition;
 import com.navercorp.pinpoint.bootstrap.instrument.Type;
 import com.navercorp.pinpoint.bootstrap.interceptor.ByteCodeMethodDescriptorSupport;
 import com.navercorp.pinpoint.bootstrap.interceptor.Interceptor;
@@ -55,9 +55,9 @@ import com.navercorp.pinpoint.bootstrap.interceptor.group.InterceptorGroupInvoca
 import com.navercorp.pinpoint.profiler.interceptor.DebugGroupDelegateSimpleInterceptor;
 import com.navercorp.pinpoint.profiler.interceptor.DebugGroupDelegateStaticInterceptor;
 import com.navercorp.pinpoint.profiler.interceptor.DefaultMethodDescriptor;
-import com.navercorp.pinpoint.profiler.interceptor.InterceptorRegistryBinder;
 import com.navercorp.pinpoint.profiler.interceptor.GroupDelegateSimpleInterceptor;
 import com.navercorp.pinpoint.profiler.interceptor.GroupDelegateStaticInterceptor;
+import com.navercorp.pinpoint.profiler.interceptor.InterceptorRegistryBinder;
 import com.navercorp.pinpoint.profiler.util.ApiUtils;
 import com.navercorp.pinpoint.profiler.util.JavaAssistUtils;
 
@@ -927,7 +927,7 @@ public class JavaAssistClass implements InstrumentClass {
    @Override
     public boolean hasField(String name, String type) {
         try {
-            ctClass.getField(name, type);
+            ctClass.getField(name, JavaAssistUtils.toJvmSignature(type));
         } catch (NotFoundException e) {
             return false;
         }
diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/util/JavaAssistUtils.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/util/JavaAssistUtils.java
index 63b86c8ad..3201c3a1f 100644
--- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/util/JavaAssistUtils.java
+++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/util/JavaAssistUtils.java
@@ -105,9 +105,7 @@ public final class JavaAssistUtils {
 
     }
 
-
-    //for test
-    static String toJvmSignature(String javaType) {
+    public static String toJvmSignature(String javaType) {
         if (javaType == null) {
             throw new NullPointerException("javaType must not be null");
         }