You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/09/15 19:47:41 UTC
git commit: Seeing some very odd behavior on different Java VMs with
serialization of UUIDs.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 47cda09de -> 983ba6996
Seeing some very odd behavior on different Java VMs with serialization of UUIDs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/983ba699
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/983ba699
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/983ba699
Branch: refs/heads/two-dot-o
Commit: 983ba69963de7c0f28d09b5a97c93d7d1c7e37ab
Parents: 47cda09
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Sep 15 13:47:27 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Sep 15 13:47:27 2014 -0400
----------------------------------------------------------------------
.../notifications/ApplicationQueueMessage.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/983ba699/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java
index 68c62d9..91f1312 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/notifications/ApplicationQueueMessage.java
@@ -61,13 +61,23 @@ public class ApplicationQueueMessage extends Message {
public static ApplicationQueueMessage generate(Message message) {
// this crazyness may indicate that Core Persistence is not storing UUIDs correctly
+
byte[] mpaBytes = (byte[])message.getObjectProperty(MESSAGE_PROPERTY_APPLICATION_UUID);
UUID mpaUuid = bytesToUuid(mpaBytes);
+
byte[] mpnBytes = (byte[])message.getObjectProperty(MESSAGE_PROPERTY_NOTIFICATION_ID);
UUID mpnUuid = bytesToUuid(mpnBytes);
- // end of crazyness
- UUID mpdUuid = (UUID)message.getObjectProperty(MESSAGE_PROPERTY_DEVICE_UUID);
+ final UUID mpdUuid;
+ Object o = message.getObjectProperty(MESSAGE_PROPERTY_DEVICE_UUID);
+ if ( o instanceof UUID ) {
+ mpdUuid = (UUID)message.getObjectProperty(MESSAGE_PROPERTY_DEVICE_UUID);
+ } else {
+ byte[] mpdBytes = (byte[])o;
+ mpdUuid = bytesToUuid(mpdBytes);
+ }
+
+ // end of crazyness
return new ApplicationQueueMessage(
mpaUuid, mpnUuid, mpdUuid,