You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by rm...@apache.org on 2014/02/20 00:33:27 UTC
svn commit: r1569974 - in /incubator/sirona/trunk:
agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java
core/src/main/java/org/apache/sirona/store/tracking/InMemoryPathTrackingDataStore.java
Author: rmannibucau
Date: Wed Feb 19 23:33:27 2014
New Revision: 1569974
URL: http://svn.apache.org/r1569974
Log:
avoiding NPE
Modified:
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java
incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/tracking/InMemoryPathTrackingDataStore.java
Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java?rev=1569974&r1=1569973&r2=1569974&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/test/sirona/javaagent/PathTrackingInvocationListenerTest.java Wed Feb 19 23:33:27 2014
@@ -41,7 +41,7 @@ import java.util.Set;
public class PathTrackingInvocationListenerTest
{
- @Test @Ignore("NPE to fix")
+ @Test
@AgentArgs(value = "",
sysProps = "project.build.directory=${project.build.directory}|sirona.agent.debug=${sirona.agent.debug}|org.apache.sirona.configuration.sirona.properties=${project.build.directory}/test-classes/pathtracking/sirona.properties")
public void simpleTest()
Modified: incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/tracking/InMemoryPathTrackingDataStore.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/tracking/InMemoryPathTrackingDataStore.java?rev=1569974&r1=1569973&r2=1569974&view=diff
==============================================================================
--- incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/tracking/InMemoryPathTrackingDataStore.java (original)
+++ incubator/sirona/trunk/core/src/main/java/org/apache/sirona/store/tracking/InMemoryPathTrackingDataStore.java Wed Feb 19 23:33:27 2014
@@ -24,6 +24,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -53,16 +54,19 @@ public class InMemoryPathTrackingDataSto
@Override
public void store( Collection<PathTrackingEntry> pathTrackingEntries )
{
+ if ( pathTrackingEntries == null )
+ {
+ return;
+ }
+
// possible different trackingId so get that
Map<String, Set<PathTrackingEntry>> entries = new HashMap<String, Set<PathTrackingEntry>>();
for ( PathTrackingEntry pathTrackingEntry : pathTrackingEntries )
{
Set<PathTrackingEntry> entriesList = entries.get( pathTrackingEntry.getTrackingId() );
-
- if ( pathTrackingEntries == null )
- {
- pathTrackingEntries = new TreeSet<PathTrackingEntry>( PathTrackingEntryComparator.INSTANCE );
+ if (entriesList == null) {
+ entriesList = new HashSet<PathTrackingEntry>();
}
entriesList.add( pathTrackingEntry );
entries.put( pathTrackingEntry.getTrackingId(), entriesList );