http://git-wip-us.apache.org/repos/asf/geode/blob/21f405b8/geode-core/src/main/java/org/apache/geode/internal/cache/JtaAfterCompletionMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/JtaAfterCompletionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/JtaAfterCompletionMessage.java index b919244..ce78d1f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/JtaAfterCompletionMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/JtaAfterCompletionMessage.java @@ -12,9 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -/** - * - */ package org.apache.geode.internal.cache; import java.io.DataInput; @@ -35,9 +32,6 @@ import org.apache.geode.internal.cache.TXRemoteCommitMessage.RemoteCommitRespons import org.apache.geode.internal.cache.TXRemoteCommitMessage.TXRemoteCommitReplyMessage; import org.apache.geode.internal.logging.LogService; -/** - * - */ public class JtaAfterCompletionMessage extends TXMessage { private static final Logger logger = LogService.getLogger(); @@ -78,12 +72,6 @@ public class JtaAfterCompletionMessage extends TXMessage { return response; } - /* - * (non-Javadoc) - * - * @see - * org.apache.geode.internal.cache.TXMessage#operateOnTx(org.apache.geode.internal.cache.TXId) - */ @Override protected boolean operateOnTx(TXId txId, DistributionManager dm) throws RemoteOperationException { TXManagerImpl txMgr = GemFireCacheImpl.getInstance().getTXMgr(); @@ -99,20 +87,10 @@ public class JtaAfterCompletionMessage extends TXMessage { return false; } - /* - * (non-Javadoc) - * - * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID() - */ public int getDSFID() { return JTA_AFTER_COMPLETION_MESSAGE; } - /* - * (non-Javadoc) - * - * @see org.apache.geode.internal.cache.TXMessage#toData(java.io.DataOutput) - */ @Override public void toData(DataOutput out) throws IOException { super.toData(out); @@ -120,11 +98,6 @@ public class JtaAfterCompletionMessage extends TXMessage { out.writeInt(this.processorType); } - /* - * (non-Javadoc) - * - * @see org.apache.geode.internal.cache.TXMessage#fromData(java.io.DataInput) - */ @Override public void fromData(DataInput in) throws IOException, ClassNotFoundException { super.fromData(in);
http://git-wip-us.apache.org/repos/asf/geode/blob/21f405b8/geode-core/src/main/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessage.java index 863f47d..f491261 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/JtaBeforeCompletionMessage.java @@ -12,9 +12,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -/** - * - */ package org.apache.geode.internal.cache; import java.util.Collections; @@ -31,13 +28,12 @@ import org.apache.geode.distributed.internal.ReplyProcessor21; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.internal.logging.LogService; -/** - * - */ public class JtaBeforeCompletionMessage extends TXMessage { private static final Logger logger = LogService.getLogger(); - public JtaBeforeCompletionMessage() {} + public JtaBeforeCompletionMessage() { + // do nothing + } public JtaBeforeCompletionMessage(int txUniqId, InternalDistributedMember onBehalfOfClientMember, ReplyProcessor21 processor) { @@ -58,15 +54,9 @@ public class JtaBeforeCompletionMessage extends TXMessage { } - /* - * (non-Javadoc) - * - * @see - * org.apache.geode.internal.cache.TXMessage#operateOnTx(org.apache.geode.internal.cache.TXId) - */ @Override protected boolean operateOnTx(TXId txId, DistributionManager dm) { - GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); + InternalCache cache = GemFireCacheImpl.getInstance(); TXManagerImpl txMgr = cache.getTXMgr(); if (logger.isDebugEnabled()) { logger.debug("JTA: Calling beforeCompletion for :{}", txId); @@ -75,11 +65,6 @@ public class JtaBeforeCompletionMessage extends TXMessage { return true; } - /* - * (non-Javadoc) - * - * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID() - */ public int getDSFID() { return JTA_BEFORE_COMPLETION_MESSAGE; } http://git-wip-us.apache.org/repos/asf/geode/blob/21f405b8/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp b/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp index 141e3a4..596e031 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp @@ -254,7 +254,7 @@ public class LEAF_CLASS extends PARENT_CLASS { this.value = v; } #endif - protected long getlastModifiedField() { + protected long getLastModifiedField() { return lastModifiedUpdater.get(this); } protected boolean compareAndSetLastModifiedField(long expectedValue, long newValue) { @@ -499,7 +499,7 @@ public class LEAF_CLASS extends PARENT_CLASS { } } @Override - protected final void setLastModifiedAndAccessedTimes(long lastAccessed) { + protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) { _setLastModified(lastModified); if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) { setLastAccessed(lastAccessed); http://git-wip-us.apache.org/repos/asf/geode/blob/21f405b8/geode-core/src/main/java/org/apache/geode/internal/cache/LocalDataSet.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalDataSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalDataSet.java index 248d655..483b044 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalDataSet.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalDataSet.java @@ -265,7 +265,7 @@ public class LocalDataSet implements Region, QueryExecutor { this.proxy.forceRolling(); } - public GemFireCacheImpl getCache() { + public InternalCache getCache() { return this.proxy.getCache(); }