[Bigdata-commit] SF.net SVN: bigdata:[7792] branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/ com/bigdata/bop/joinGraph/rto

[<tho...@us...>]

Revision: 7792
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7792&view=rev
Author:   thompsonbry
Date:     2014-01-14 12:59:09 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
Fixing an NPE in RTO logging.

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JGraph.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/PathIds.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JGraph.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JGraph.java	2014-01-14 12:55:58 UTC (rev 7791)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JGraph.java	2014-01-14 12:59:09 UTC (rev 7792)
@@ -555,7 +555,7 @@
                 for(Path p : paths) {
                     final EdgeSample edgeSample;
                     synchronized(edgeSamples) {
-                        edgeSample = edgeSamples.get(p.getVertexIds());
+                        edgeSample = edgeSamples.get(new PathIds(p));
                     }
                     if (edgeSample.isUnderflow()) {
                         log.warn("Underflow on path::"

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/PathIds.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/PathIds.java	2014-01-14 12:55:58 UTC (rev 7791)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph/rto/PathIds.java	2014-01-14 12:59:09 UTC (rev 7792)
@@ -50,6 +50,25 @@
         
     }
     
+    /**
+     * Convenience constructor.
+     * 
+     * @param p
+     *            A path.
+     */
+    public PathIds(final Path p) {
+
+        this(p.getVertexIds());
+
+    }
+
+    /**
+     * Core constructor.
+     * 
+     * @param ids
+     *            The ordered set of vertex identifiers for some join path
+     *            segment.
+     */
     public PathIds(final int[] ids) {
 
         if (ids == null)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.