This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository osmosis.
commit 3acde58f46972b19136635c5433b2410206f5424 Author: Bas Couwenberg <[email protected]> Date: Thu Apr 10 20:20:05 2014 +0200 Add patch from upstream master branch: 0001-replication-Fix-null-pointer-exception-in-merge-repl.patch --- ...-Fix-null-pointer-exception-in-merge-repl.patch | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/debian/patches/0001-replication-Fix-null-pointer-exception-in-merge-repl.patch b/debian/patches/0001-replication-Fix-null-pointer-exception-in-merge-repl.patch new file mode 100644 index 0000000..6b6fcfb --- /dev/null +++ b/debian/patches/0001-replication-Fix-null-pointer-exception-in-merge-repl.patch @@ -0,0 +1,48 @@ +From 4210fad83a5a8fb828f30545b1fd7c1bef653146 Mon Sep 17 00:00:00 2001 +From: Brett Henderson <[email protected]> +Date: Thu, 25 Jul 2013 21:38:19 +1000 +Subject: replication: Fix null pointer exception in --merge-replication-files +Origin: https://github.com/openstreetmap/osmosis/commit/4210fad83a5a8fb828f30545b1fd7c1bef653146 + +The --merge-replication-files task was failing to initialise its current +data state during startup. This breakage was introduced while +externalising code into the new ReplicationStore implementation. This +change fixes the initialisation code to use the replication store to +load state instead of directly loading it. + +--- a/osmosis-replication/src/main/java/org/openstreetmap/osmosis/replication/v0_6/ReplicationFileMerger.java ++++ b/osmosis-replication/src/main/java/org/openstreetmap/osmosis/replication/v0_6/ReplicationFileMerger.java +@@ -10,7 +10,6 @@ import org.openstreetmap.osmosis.core.co + import org.openstreetmap.osmosis.core.sort.v0_6.ChangeForStreamableApplierComparator; + import org.openstreetmap.osmosis.core.sort.v0_6.ChangeSorter; + import org.openstreetmap.osmosis.core.task.v0_6.ChangeSink; +-import org.openstreetmap.osmosis.core.util.PropertiesPersister; + import org.openstreetmap.osmosis.replication.common.FileReplicationStore; + import org.openstreetmap.osmosis.replication.common.ReplicationState; + import org.openstreetmap.osmosis.replication.common.ReplicationStore; +@@ -35,7 +34,6 @@ public class ReplicationFileMerger exten + private boolean sinkActive; + private ChangeSink changeSink; + private ReplicationState currentDataState; +- private PropertiesPersister dataStatePersister; + private ReplicationStore replicationStore; + + +@@ -47,7 +45,7 @@ public class ReplicationFileMerger exten + */ + public ReplicationFileMerger(File workingDirectory) { + super(workingDirectory); +- ++ + replicationStore = new FileReplicationStore(new File(getWorkingDirectory(), DATA_DIRECTORY), true); + + sinkActive = false; +@@ -77,7 +75,7 @@ public class ReplicationFileMerger exten + long intervalLength; + + // Read the current persisted state. +- currentDataState = new ReplicationState(dataStatePersister.loadMap()); ++ currentDataState = replicationStore.getCurrentState(); + + // Get the default maximum timestamp according to base calculations. + maximumTimestamp = super.calculateMaximumTimestamp(configuration, serverTimestamp, localTimestamp); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmosis.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
