[Bigdata-commit] SF.net SVN: bigdata:[4535] branches/QUADS_QUERY_BRANCH/bigdata/src/java/com /bigdata/journal/AbstractJournal.java

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

Revision: 4535
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4535&view=rev
Author:   thompsonbry
Date:     2011-05-20 18:24:33 +0000 (Fri, 20 May 2011)

Log Message:
-----------
Bug fix to the performance counters for the journal.  An NPE could be thrown if the Journal was not associated with a backing file, e.g., for the transient journal.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2011-05-20 18:06:11 UTC (rev 4534)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2011-05-20 18:24:33 UTC (rev 4535)
@@ -1213,8 +1213,10 @@
 				public void sample() {
 					final AbstractJournal jnl = ref.get();
 					if (jnl != null) {
-						setValue(jnl.getFile().toString());
-					}
+                        final File file = jnl.getFile();
+                        if (file != null)
+                            setValue(file.toString());
+                    }
 				}
 			});
 			// counters.addCounter("file", new OneShotInstrument<String>(""


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