Repository: geode Updated Branches: refs/heads/feature/GEODE-2485 b665db44c -> be467cb01
formatting Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/be467cb0 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/be467cb0 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/be467cb0 Branch: refs/heads/feature/GEODE-2485 Commit: be467cb016c51dae702adfba7f416366a46bcecd Parents: b665db4 Author: Darrel Schneider <dschnei...@pivotal.io> Authored: Fri Apr 7 10:51:01 2017 -0700 Committer: Darrel Schneider <dschnei...@pivotal.io> Committed: Fri Apr 7 10:51:01 2017 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/geode/internal/cache/TXManagerImpl.java | 2 +- .../main/java/org/apache/geode/internal/cache/TXStateProxy.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/be467cb0/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java index 7ac616a..7b821c1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java @@ -1276,7 +1276,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene } return false; } - + private void resumeProxy(TXStateProxy txProxy) { assert txProxy != null; internalResume(txProxy); http://git-wip-us.apache.org/repos/asf/geode/blob/be467cb0/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java index 5aa0aff..d392c41 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java @@ -70,8 +70,8 @@ public interface TXStateProxy extends TXStateInterface { public void suspend(); /** - * Called by {@link TXManagerImpl#internalResume(TXStateProxy)} to perform additional tasks required to - * resume a transaction + * Called by {@link TXManagerImpl#internalResume(TXStateProxy)} to perform additional tasks + * required to resume a transaction */ public void resume();
