You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2016/05/16 03:54:04 UTC
[29/42] metamodel git commit: METAMODEL-242: Fixed
METAMODEL-242: Fixed
Closes #93
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/bf439b44
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/bf439b44
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/bf439b44
Branch: refs/heads/5.x
Commit: bf439b44d03e6cc6b78b95504cc429c48f1e023e
Parents: 820b1f2
Author: Kasper S�rensen <i....@gmail.com>
Authored: Sun Apr 24 13:56:57 2016 -0700
Committer: Kasper S�rensen <i....@gmail.com>
Committed: Sun Apr 24 13:56:57 2016 -0700
----------------------------------------------------------------------
CHANGES.md | 1 +
.../metamodel/util/LegacyDeserializationObjectInputStream.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/bf439b44/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index 9be1b35..546f31c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
* [METAMODEL-235] - Fixed a bug related to handling of null or missing values in ElasticSearch using REST client.
* [METAMODEL-225] - Fixed support for nested objects and arrays in ElasticSearch using REST client.
+ * [METAMODEL-242] - Fixed issue when de-serializing old enum-instances of FunctionType.
### Apache MetaModel 4.5.2
http://git-wip-us.apache.org/repos/asf/metamodel/blob/bf439b44/core/src/main/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStream.java b/core/src/main/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStream.java
index 289f823..c4d4570 100644
--- a/core/src/main/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStream.java
+++ b/core/src/main/java/org/apache/metamodel/util/LegacyDeserializationObjectInputStream.java
@@ -235,7 +235,7 @@ public class LegacyDeserializationObjectInputStream extends ObjectInputStream {
break;
case CLASS_NAME_FUNCTION_TYPE:
if (isEnumExpected(objectStreamClass)) {
- final ObjectStreamClass legacyOperatorTypeResult = ObjectStreamClass.lookup(LegacyOperatorType.class);
+ final ObjectStreamClass legacyOperatorTypeResult = ObjectStreamClass.lookup(LegacyFunctionType.class);
return legacyOperatorTypeResult;
}
break;