You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/07/14 04:12:27 UTC
[geode] 01/02: GEODE-5357: Inline uncohesive method.
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 2f9258fa2c2f4dab260c71ab683b1b2ae831d3af
Author: Sarge <md...@pivotal.io>
AuthorDate: Fri Jun 29 08:49:54 2018 -0700
GEODE-5357: Inline uncohesive method.
---
.../java/org/apache/geode/pdx/internal/PdxReaderImpl.java | 11 ++++++++++-
.../main/java/org/apache/geode/pdx/internal/PdxType.java | 14 --------------
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
index 88175e6..9e859e3 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
@@ -684,7 +684,16 @@ public class PdxReaderImpl implements InternalPdxReader, java.io.Serializable {
protected Object basicGetObject() {
String pdxClassName = getPdxType().getClassName();
- Class<?> pdxClass = getPdxType().getPdxClass();
+ Class<?> pdxClass;
+ try {
+ pdxClass = InternalDataSerializer.getCachedClass(pdxClassName);
+ } catch (Exception e) {
+ PdxSerializationException ex = new PdxSerializationException(
+ LocalizedStrings.DataSerializer_COULD_NOT_CREATE_AN_INSTANCE_OF_A_CLASS_0
+ .toLocalizedString(pdxClassName),
+ e);
+ throw ex;
+ }
{
AutoClassInfo ci = getPdxType().getAutoInfo(pdxClass);
if (ci != null) {
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java
index 8ec7323..f659761 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxType.java
@@ -33,9 +33,7 @@ import org.apache.geode.DataSerializer;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.tier.sockets.OldClientSupportService;
-import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.pdx.PdxFieldAlreadyExistsException;
-import org.apache.geode.pdx.PdxSerializationException;
import org.apache.geode.pdx.internal.AutoSerializableManager.AutoClassInfo;
public class PdxType implements DataSerializable {
@@ -227,18 +225,6 @@ public class PdxType implements DataSerializable {
return this.className;
}
- public Class<?> getPdxClass() {
- try {
- return InternalDataSerializer.getCachedClass(getClassName());
- } catch (Exception e) {
- PdxSerializationException ex = new PdxSerializationException(
- LocalizedStrings.DataSerializer_COULD_NOT_CREATE_AN_INSTANCE_OF_A_CLASS_0
- .toLocalizedString(getClassName()),
- e);
- throw ex;
- }
- }
-
public boolean getNoDomainClass() {
return this.noDomainClass;
}