geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject geode git commit: GEODE-2707: Removing TXLockToken class and entry in sanctionedDataSerializables.txt
Date Wed, 19 Jul 2017 17:21:17 GMT
Repository: geode
Updated Branches:
  refs/heads/develop c5e777923 -> b673ff982


GEODE-2707: Removing TXLockToken class and entry in sanctionedDataSerializables.txt

* this closes #592


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b673ff98
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b673ff98
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b673ff98

Branch: refs/heads/develop
Commit: b673ff982917561f79fe50d3c9642d50f77f90e7
Parents: c5e7779
Author: YehEmily <emilyyeh1997@gmail.com>
Authored: Mon Jun 19 10:36:53 2017 -0700
Committer: Jinmei Liao <jiliao@pivotal.io>
Committed: Wed Jul 19 10:20:07 2017 -0700

----------------------------------------------------------------------
 .../geode/internal/cache/locks/TXLockToken.java | 92 --------------------
 .../sanctionedDataSerializables.txt             |  4 -
 2 files changed, 96 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/b673ff98/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockToken.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockToken.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockToken.java
deleted file mode 100755
index 6468004..0000000
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockToken.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information
regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version
2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain
a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express
- * or implied. See the License for the specific language governing permissions and limitations
under
- * the License.
- */
-
-package org.apache.geode.internal.cache.locks;
-
-import org.apache.geode.DataSerializable;
-import org.apache.geode.DataSerializer;
-// import org.apache.geode.cache.Region;
-import java.io.*;
-
-import org.apache.commons.lang.StringUtils;
-
-/**
- * Represents one transaction lock.
- *
- */
-public class TXLockToken implements DataSerializable {
-  private static final long serialVersionUID = 8172108573123093776L;
-
-  private String regionFullPath;
-
-  private Object name;
-
-  public TXLockToken(String regionFullPath, Object name) {
-    this.regionFullPath = regionFullPath;
-    this.name = name;
-  }
-
-  @Override
-  public int hashCode() {
-    int result = 17;
-    final int mult = 37;
-
-    result = mult * result + (this.regionFullPath == null ? 0 : this.regionFullPath.hashCode());
-    result = mult * result + (this.name == null ? 0 : this.name.hashCode());
-
-    return result;
-  }
-
-  @Override
-  public boolean equals(Object other) {
-    if (other == this)
-      return true;
-    if (other == null)
-      return false;
-    if (!(other instanceof TXLockToken))
-      return false;
-    final TXLockToken that = (TXLockToken) other;
-
-    if (!StringUtils.equals(this.regionFullPath, that.regionFullPath))
-      return false;
-    if (this.name != that.name && !(this.name != null && this.name.equals(that.name)))
-      return false;
-
-    return true;
-  }
-
-  @Override
-  public String toString() {
-    return "[TXLockToken: " + this.regionFullPath + "//" + this.name + "]";
-  }
-
-  // -------------------------------------------------------------------------
-  // DataSerializable support
-  // -------------------------------------------------------------------------
-
-  public TXLockToken() {}
-
-  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
-    this.regionFullPath = DataSerializer.readString(in);
-    this.name = DataSerializer.readObject(in);
-  }
-
-  public void toData(DataOutput out) throws IOException {
-    DataSerializer.writeString(this.regionFullPath, out);
-    DataSerializer.writeObject(this.name, out);
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/geode/blob/b673ff98/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index e9280f8..1820393 100644
--- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -1475,10 +1475,6 @@ org/apache/geode/internal/cache/locks/TXLockIdImpl,2
 fromData,22,2a2bb80012c00013b500022a2bb900140100b50005b1
 toData,19,2ab400022bb800152b2ab40005b900160200b1
 
-org/apache/geode/internal/cache/locks/TXLockToken,2
-fromData,17,2a2bb80011b500022a2bb80012b50003b1
-toData,17,2ab400022bb800132ab400032bb80014b1
-
 org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage,2
 fromData,40,2a2bb7001d2a2bb9001e0100b500052a2bb8001fb500022a2bb80020b500032a2bb80021b50004b1
 toData,40,2a2bb700172b2ab40005b9001802002ab400022bb800192ab400032bb8001a2ab400042bb8001bb1


Mime
View raw message