Merge branch 'master' of https://github.com/naver/pinpoint into http-async

pom.xml

@@ -726,6 +726,31 @@
                 <artifactId>findbugs-maven-plugin</artifactId>
                 <version>2.5.5</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.4</version>
+                <executions>
+                    <execution>
+                        <id>enforce-pinpoint-build-requirements</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireEnvironmentVariable>
+                                    <variableName>JAVA_6_HOME</variableName>
+                                </requireEnvironmentVariable>
+                                <requireEnvironmentVariable>
+                                    <variableName>JAVA_7_HOME</variableName>
+                                </requireEnvironmentVariable>
+                            </rules>
+                            <fail>true</fail>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/DefaultInterceptorFactoryTest.java

@@ -49,6 +49,7 @@ public class DefaultInterceptorFactoryTest {
     @Before
     public void setUp() {
         reset(instrumentor, traceContext, aClass, aMethod);
+        when(pluginContext.getTraceContext()).thenReturn(traceContext);
         when(aMethod.getDescriptor()).thenReturn(descriptor);
     }