Return-Path: X-Original-To: apmail-clerezza-commits-archive@www.apache.org Delivered-To: apmail-clerezza-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E882210A4A for ; Fri, 11 Oct 2013 19:36:12 +0000 (UTC) Received: (qmail 98970 invoked by uid 500); 11 Oct 2013 19:36:12 -0000 Delivered-To: apmail-clerezza-commits-archive@clerezza.apache.org Received: (qmail 98939 invoked by uid 500); 11 Oct 2013 19:36:12 -0000 Mailing-List: contact commits-help@clerezza.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@clerezza.apache.org Delivered-To: mailing list commits@clerezza.apache.org Received: (qmail 98932 invoked by uid 99); 11 Oct 2013 19:36:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Oct 2013 19:36:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Oct 2013 19:36:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0F40E2388980; Fri, 11 Oct 2013 19:35:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1531398 - /clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java Date: Fri, 11 Oct 2013 19:35:50 -0000 To: commits@clerezza.apache.org From: reto@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131011193551.0F40E2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reto Date: Fri Oct 11 19:35:50 2013 New Revision: 1531398 URL: http://svn.apache.org/r1531398 Log: CLEREZZA-792:avoiding NullPointer on graphs Modified: clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java Modified: clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java URL: http://svn.apache.org/viewvc/clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java?rev=1531398&r1=1531397&r2=1531398&view=diff ============================================================================== --- clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java (original) +++ clerezza/trunk/rdf.jena.tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java Fri Oct 11 19:35:50 2013 @@ -229,7 +229,7 @@ public class TdbTcProvider implements We MGraph mGraph = getMGraph(tcDir); mGraph.addAll(triples); Graph result = mGraph.getGraph(); - + TDB.sync(dir2Dataset.get(tcDir)); graphMap.put(name, result); return result; } @@ -405,6 +405,7 @@ public class TdbTcProvider implements We synchronized(dir2Dataset) { for (Map.Entry entry : dir2Dataset.entrySet()) { Lock l = dir2Lock.get(entry.getKey()); + if (l == null) return; l.lock(); try { TDB.sync(entry.getValue());