geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hiteshkhame...@apache.org
Subject [50/50] [abbrv] incubator-geode git commit: fixed test issues.
Date Thu, 18 Aug 2016 19:28:08 GMT
fixed test issues.


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

Branch: refs/heads/feature/GEODE-1372
Commit: 2330ee55087d55bc9ab194b13a076e7b6f307c3e
Parents: 07e8c76
Author: Hitesh Khamesra <hkhamesra@pivotal.io>
Authored: Wed Aug 17 13:17:15 2016 -0700
Committer: Hitesh Khamesra <hkhamesra@pivotal.io>
Committed: Wed Aug 17 13:17:15 2016 -0700

----------------------------------------------------------------------
 .../gemfire/cache30/ReconnectDUnitTest.java     |  1 +
 .../gemfire/distributed/LocatorDUnitTest.java   |  2 -
 .../LocatorUDPSecurityDUnitTest.java            |  2 +-
 .../gms/messenger/GMSEncryptJUnitTest.java      | 11 ++--
 .../messenger/JGroupsMessengerJUnitTest.java    |  3 +
 .../sanctionedDataSerializables.txt             | 68 +++-----------------
 6 files changed, 19 insertions(+), 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2330ee55/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
index 4950057..c3002a5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
@@ -122,6 +122,7 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase
   @Override
   public Properties getDistributedSystemProperties() {
     if (dsProperties == null) {
+      dsProperties = new Properties();
       dsProperties.put(MAX_WAIT_TIME_RECONNECT, "20000");
       dsProperties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
       dsProperties.put(DISABLE_AUTO_RECONNECT, "false");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2330ee55/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index bf6d3f1..81473da 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -1821,7 +1821,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       props.setProperty(MCAST_PORT, "0");
       props.setProperty(LOCATORS, locators);
       props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
-      addDSProps(props);
       system = (InternalDistributedSystem) DistributedSystem.connect(props);
       system.disconnect();
     } finally {
@@ -1868,7 +1867,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
               props.setProperty(MCAST_PORT, "0");
               props.setProperty(LOCATORS, locators);
               props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
-              addDSProps(props);
               DistributedSystem.connect(props);
             }
           };

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2330ee55/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java
index 7e3658c..facedbc 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorUDPSecurityDUnitTest.java
@@ -45,7 +45,7 @@ public class LocatorUDPSecurityDUnitTest extends LocatorDUnitTest{
   
   @Test
   public void testLoop() throws Exception {
-    for(int i=0; i < 100; i++) {
+    for(int i=0; i < 1; i++) {
       testMultipleLocatorsRestartingAtSameTime();
       tearDown();
       setUp();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2330ee55/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
index eb77da4..1bf8639 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/GMSEncryptJUnitTest.java
@@ -82,13 +82,12 @@ public class GMSEncryptJUnitTest {
     }
     int viewId = 1;
     List<InternalDistributedMember> mbrs = new LinkedList<>();
-    //mbrs.add(mockMembers[0]);
+    mbrs.add(mockMembers[0]);
     mbrs.add(mockMembers[1]);
     mbrs.add(mockMembers[2]);
-    mbrs.add(mockMembers[3]);
-
+    
     //prepare the view
-    netView = new NetView(mockMembers[1], viewId, mbrs);
+    netView = new NetView(mockMembers[0], viewId, mbrs);
 
   }
 
@@ -578,8 +577,8 @@ public class GMSEncryptJUnitTest {
     SecretKey bobSharedSecret = bobKeyAgree.generateSecret(dhKalgo);
     System.out.println("Bob   secret: " + toHexString(bobSharedSecret.getEncoded()));
     
-    applyMAC(aliceSharedSecret);
-    applyMAC(bobSharedSecret);
+    //applyMAC(aliceSharedSecret);
+    //applyMAC(bobSharedSecret);
     
     // Compare Alice and Bob
     if (!java.util.Arrays.equals(aliceSharedSecret.getEncoded(), bobSharedSecret.getEncoded()))

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2330ee55/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
index a156fbf..00c9e32 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
@@ -440,8 +440,10 @@ public class JGroupsMessengerJUnitTest {
     InternalDistributedMember addr = messenger.getMemberID();
     NetView v = new NetView(addr);
     when(joinLeave.getView()).thenReturn(v);
+    
 
     InternalDistributedMember sender = createAddress(8888);
+    
     JoinRequestMessage msg = new JoinRequestMessage(messenger.localAddress, sender, null,
-1, 0);
     
     Message jmsg = messenger.createJGMessage(msg, messenger.jgAddress, Version.CURRENT_ORDINAL);
@@ -450,6 +452,7 @@ public class JGroupsMessengerJUnitTest {
     verify(mh, times(1)).processMessage(any(JoinRequestMessage.class));
     
     LeaveRequestMessage lmsg = new LeaveRequestMessage(messenger.localAddress, sender, "testing");
+    when(joinLeave.getMemberID(any())).thenReturn(sender);
     jmsg = messenger.createJGMessage(lmsg, messenger.jgAddress, Version.CURRENT_ORDINAL);
     interceptor.up(new Event(Event.MSG, jmsg));
     

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2330ee55/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
index 0589618..9fc642d 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
@@ -199,9 +199,9 @@ fromData,27,2a2bb7000c2a2bb9000d0100b500032a2bb8000ec0000fb50002b1
 toData,24,2a2bb700092b2ab40003b9000a02002ab400022bb8000bb1
 
 com/gemstone/gemfire/distributed/internal/StartupMessage,3
-fromDataProblem,38,2ab40039c7000e2abb006659b70067b500392ab400392bb60068572ab400391269b6006857b1
-fromData,293,2a2bb7006a2a2bb8006bb500092a2bb9006c0100b5000c2a2bb9006d0100b5000d2a2bb9006d0100b500112bb9006c01003d033e1d1ca2003e2bb8006e3a042bb9006c010036051904c6000d19040301011505b8006fa700183a062ab2007004bd00225903190653b60026b70071840301a7ffc32bb9006c01003e03360415041da200492bb8006e3a052bb8006e3a062bb9006c010036071905c600121906c6000d19051906150703b80072a700183a082ab2007304bd00225903190853b60026b70071840401a7ffb72a2bb80074c00075b500122a2bb9006c0100b500172a2bb8006bb500182a2bb9006d0100b50019bb005f59b700603a0419042bb600762a1904b60077b5000a2a1904b60078b5000b2a1904b60079b5000e2a1904b6007ab5000fb1
-toData,318,2a2bb7004c2ab400092bb8004d2b2ab4000cb9004e02002b2ab4000db9004f02002b2ab40011b9004f0200b800504d2b2cbeb9004e0200033e1d2cbea2001f2c1d32b600512bb800522b2c1d32b60053b9004e0200840301a7ffe1b800544e2b2dbeb9004e020003360415042dbea200782d150432c100559900302d150432c00055b60056b600573a052d150432c00055b60058b600573a062d150432c00055b600593607a700272d150432c0005ab6005b3a052d150432c0005ab6005c3a062d150432c0005ab6005d360719052bb8005219062bb800522b1507b9004e0200840401a7ff872ab400122bb8005e2b2ab40017b9004e02002ab400182bb8004d2b2ab40019b9004f0200bb005f59b700603a0419042ab4000ab6006119042ab4000bb6006219042ab4000eb6006319042ab4000fb6006419042bb60065b1
+fromDataProblem,38,2ab40039c7000e2abb006759b70068b500392ab400392bb60069572ab40039126ab6006957b1
+fromData,293,2a2bb7006b2a2bb8006cb500092a2bb9006d0100b5000c2a2bb9006e0100b5000d2a2bb9006e0100b500112bb9006d01003d033e1d1ca2003e2bb8006f3a042bb9006d010036051904c6000d19040301011505b80070a700183a062ab2007104bd00225903190653b60026b70072840301a7ffc32bb9006d01003e03360415041da200492bb8006f3a052bb8006f3a062bb9006d010036071905c600121906c6000d19051906150703b80073a700183a082ab2007404bd00225903190853b60026b70072840401a7ffb72a2bb80075c00076b500122a2bb9006d0100b500172a2bb8006cb500182a2bb9006e0100b50019bb006059b700613a0419042bb600772a1904b60078b5000a2a1904b60079b5000b2a1904b6007ab5000e2a1904b6007bb5000fb1
+toData,318,2a2bb7004d2ab400092bb8004e2b2ab4000cb9004f02002b2ab4000db9005002002b2ab40011b900500200b800514d2b2cbeb9004f0200033e1d2cbea2001f2c1d32b600522bb800532b2c1d32b60054b9004f0200840301a7ffe1b800554e2b2dbeb9004f020003360415042dbea200782d150432c100569900302d150432c00056b60057b600583a052d150432c00056b60059b600583a062d150432c00056b6005a3607a700272d150432c0005bb6005c3a052d150432c0005bb6005d3a062d150432c0005bb6005e360719052bb8005319062bb800532b1507b9004f0200840401a7ff872ab400122bb8005f2b2ab40017b9004f02002ab400182bb8004e2b2ab40019b900500200bb006059b700613a0419042ab4000ab6006219042ab4000bb6006319042ab4000eb6006419042ab4000fb6006519042bb60066b1
 
 com/gemstone/gemfire/distributed/internal/StartupResponseMessage,3
 fromDataProblem,43,2ab40026c7000e2abb003859b70039b500262ab400262bb6003a572ab40026123b123cb8003db6003a57b1
@@ -293,21 +293,16 @@ toDataPre_GFE_7_1_0_0,226,2ab400139e000704a7000403b800432ab600502bb800982b2ab600
 toDataPre_GFE_9_0_0_0,240,2ab400139e000704a7000403b800432ab600502bb800982b2ab6004fb9009902002ab400062bb8007d033d2ab40029b9007e01009900071c04803d2ab40029b9006d01009900071c05803d2ab4003a9900071c07803d1c1008803d2b1c1100ff7e91b9009a02002b2ab40011b9009902002b2ab40002b9009902002b2ab40013b9009a02002ab400202bb800802ab400182bb8007d2ab40013100da0000e2ab400192bb8007da7000e2ab40014b8009b2bb8007d2ab4001ec700081247a7000a2ab4001eb600812bb8007d2ab4001ec7000911012ca7000a2ab4001eb60082b800832bb800842b2ab4001b04b80085b1
 
 com/gemstone/gemfire/distributed/internal/membership/NetView,2
-<<<<<<< HEAD
-fromData,90,2a2bb80065c00023b5000e2a2bb900660100b500032a2bb80067b50006b200389a00122ab40006c7000bbb003959b7003abf2abb0007592ab40006b70008b500092a2bb80068b5000b2a2bb80068b5000d2a2bb80069b50002b1
-toData,52,2ab4000e2bb800602b2ab40003b9006102002a2ab400062bb700622ab4000b2bb800632ab4000d2bb800632ab400022bb80064b1
-=======
-fromData,77,2a2bb80064c0002bb500112a2bb900650100b500062a2bb80066b500092abb000a592ab40009b7000bb5000c2a2bb80067b5000e2a2bb80067b500102a2bb80068b500052a2bb80069b50004b1
-toData,60,2ab400112bb8005e2b2ab40006b9005f02002a2ab400092bb700602ab4000e2bb800612ab400102bb800612ab400052bb800622ab400042bb80063b1
->>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
+fromData,98,2a2bb8006ec0002bb500112a2bb9006f0100b500062a2bb80070b50009b200409a00122ab40009c7000bbb004159b70042bf2abb000a592ab40009b7000bb5000c2a2bb80071b5000e2a2bb80071b500102a2bb80072b500052a2bb80073b50004b1
+toData,60,2ab400112bb800682b2ab40006b9006902002a2ab400092bb7006a2ab4000e2bb8006b2ab400102bb8006b2ab400052bb8006c2ab400042bb8006db1
 
 com/gemstone/gemfire/distributed/internal/membership/gms/GMSMember,2
-fromData,150,2a2bb80046b5001a2bb9004701003d2a1c047e99000704a7000403b500182a1c057e99000704a7000403b500192a2bb80048b500152a2bb900490100b500022a2bb900490100b500032a2bb900490100b500052a2bb9004a0100b5003b2a2bb9004a0100b500072a2bb900490100b500062a2bb8004bb500082a2bb8004cb500092a2bb9004d0100b5001b2a2bb9004d0100b5001cb1
-toData,145,2b2ab4001a04b8003e033d2ab400189900071c04803d2ab400199900071c05803d2b1cb9003f02002ab400152bb800402b2ab40002b9004102002b2ab40003b9004102002b2ab40005b9004102002b2ab4003bb9004202002b2ab40007b9004202002b2ab40006b9004102002ab400082bb800432ab400092bb800442b2ab4001bb9004503002b2ab4001cb900450300b1
+fromData,62,2a2bb600472a2bb900480100b500052a2bb900490100b5003b2a2bb900490100b500072a2bb900480100b500062a2bb8004ab500082a2bb8004bb50009b1
+toData,62,2a2bb6003e2b2ab40005b9003f02002b2ab4003bb9004002002b2ab40007b9004002002b2ab40006b9003f02002ab400082bb800412ab400092bb80042b1
 
 com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorRequest,2
-fromData,97,2a2bb8001cc00019b500022bb9001d01003d2abb001e591cb7001fb50003033e1d1ca2001a2ab400032bb8001cc00019b90020020057840301a7ffe72a2bb9001d0100b500042a2bb9001d0100b500062a2bb80021b500072a2bb80022b50005b1
-toData,114,2ab400022bb800132ab40003c6003a2b2ab40003b900140100b9001502002ab40003b9001601004d2cb9001701009900152cb900180100c000194e2d2bb80013a7ffe8a7000a2b03b9001502002b2ab40004b9001502002b2ab40006b9001502002ab400072bb8001a2ab400052bb8001bb1
+fromData,97,2a2bb8001dc0001ab500022bb9001e01003d2abb001f591cb70020b50005033e1d1ca2001a2ab400052bb8001dc0001ab90021020057840301a7ffe72a2bb9001e0100b500062a2bb9001e0100b500082a2bb80022b500042a2bb80023b50007b1
+toData,114,2ab400022bb800142ab40005c6003a2b2ab40005b900150100b9001602002ab40005b9001701004d2cb9001801009900152cb900190100c0001a4e2d2bb80014a7ffe8a7000a2b03b9001602002b2ab40006b9001602002b2ab40008b9001602002ab400042bb8001b2ab400072bb8001cb1
 
 com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorResponse,2
 fromData,105,2a2bb80026c00027b500022a2bb80026c00027b500032a2bb80028b5000a2a2bb80029b5000c2a2bb9002a0100b500092ab400099a00342a2bb9002a0100b500042a2bb9002a0100b500072a2bb9002a0100b500082a2bb80026c0002bb500052a2bb8002cb50006b1
@@ -876,13 +871,8 @@ fromData,93,2a2bb7000a2a2bb8000bb6000cb500032a2bb8000db6000eb500042a2bb8000fb600
 toData,91,2a2bb700132ab40003b800142bb800152ab40004b800162bb800172ab40005b800182bb800192b2ab40009b9001a02002ab400099e00262ab400074d2cbe3e03360415041da200152c1504323a0519052bb8001b840401a7ffebb1
 
 com/gemstone/gemfire/internal/cache/CacheDistributionAdvisor$CacheProfile,2
-<<<<<<< HEAD
 fromData,113,2a2bb700692bb9006a01003d2a1cb6001e2a1cb7006b9900162abb006c59b7006db500282ab400282bb8006e2a1cb7006f99000e2a2bb80070c00071b5000e2a1cb7007299000e2a2bb80070c00071b5000f2a2bb80070c00073b500192a1cb7007499000e2a2bb80070c00075b50018b1
 toData,101,2a2bb700612b2ab6001db9006202002ab40028c6000b2ab400282bb800632ab4000eb9002e01009a000c2a2ab4000e2bb700642ab4000fb9002e01009a000c2a2ab4000f2bb700642ab400192bb800652ab40018b9003201009a000b2ab400182bb80065b1
-=======
-fromData,113,2a2bb7006a2bb9006b01003d2a1cb6001e2a1cb7006c9900162abb006d59b7006eb500282ab400282bb8006f2a1cb7007099000e2a2bb80071c00072b5000e2a1cb7007399000e2a2bb80071c00072b5000f2a2bb80071c00074b500192a1cb7007599000e2a2bb80071c00076b50018b1
-toData,101,2a2bb700622b2ab6001db9006302002ab40028c6000b2ab400282bb800642ab4000eb9002e01009a000c2a2ab4000e2bb700652ab4000fb9002e01009a000c2a2ab4000f2bb700652ab400192bb800662ab40018b9003201009a000b2ab400182bb80066b1
->>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/CacheServerAdvisor$CacheServerProfile,2
 fromData,53,2a2bb700112a2bb80012b500042a2bb900130100b500062abb001459b70015b500052ab400052bb800162a2bb900170100b60018b1
@@ -980,13 +970,8 @@ fromData,197,2a2bb7003a2a2bb8003bc0003cb500062a2bb8003d88b500162a2ab40016bd003eb
 toData,165,2a2bb700492ab400062bb8004a2ab40016852bb8004b2ab400169e007bbb004c592ab40016b7004d4d033e03360415042ab40016a200511d9a00122ab40007150432b4002cc60005043e2ab40007150432b4002c3a052c1905b6004e572ab4000715043201b5002c2ab400071504322bb6004f2ab400071504321905b5002c840401a7ffac2b1db9005002001d9900082c2bb800512ab4000cc6000b2ab4000c2bb8004ab1
 
 com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage,2
-<<<<<<< HEAD
 fromData,171,2a2bb700632bb9006401003d1c047e9900142a2bb900650100b500092ab40009b800661c077e99000d2a2bb900650100b500061c057e99000e2a2bb80067c00068b500072bb800674e2dc100699900252a03b5000e2a2dc00069b8006ab500082ab40008c7001b2a2dc00069b5004ea700102a2dc0006bb500082a04b5000e2a2bb80067c0006cb5000a2a2bb8006db5000c2a2bb8006eb5000b2a1c10407e99000704a7000403b5000db1
 toData,173,2a2bb70070033d2ab400099900081c0480933d2ab40006029f00081c0780933d2ab40007c600081c0580933d2ab4000d9900091c104080933d2b1cb9007102002ab4000999000d2b2ab40009b9007202002ab40006029f000d2b2ab40006b9007202002ab40007c6000b2ab400072bb800732ab4000e99000e2ab400082bb80073a700102ab40008b9005901002bb800732ab4000a2bb800732ab4000cc000742bb800752ab4000b2bb80076b1
-=======
-fromData,171,2a2bb700622bb9006301003d1c047e9900142a2bb900640100b500092ab40009b800651c077e99000d2a2bb900640100b500061c057e99000e2a2bb80066c00067b500072bb800664e2dc100689900252a03b5000e2a2dc00068b80069b500082ab40008c7001b2a2dc00068b5004da700102a2dc0006ab500082a04b5000e2a2bb80066c0006bb5000a2a2bb8006cb5000c2a2bb8006db5000b2a1c10407e99000704a7000403b5000db1
-toData,173,2a2bb7006f033d2ab400099900081c0480933d2ab40006029f00081c0780933d2ab40007c600081c0580933d2ab4000d9900091c104080933d2b1cb9007002002ab4000999000d2b2ab40009b9007102002ab40006029f000d2b2ab40006b9007102002ab40007c6000b2ab400072bb800722ab4000e99000e2ab400082bb80072a700102ab40008b9005801002bb800722ab4000a2bb800722ab4000cc000732bb800742ab4000b2bb80075b1
->>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/DistributedRemoveAllOperation$RemoveAllEntryData,1
 toData,136,2ab4000a4d2c2bb8003f2b2ab40010b40040b9004102002ab400063e2ab40022c600081d0780913e2ab40015c600191d100880913e2ab40015c100429900091d102080913e1d108080913e2b1db9004102002ab40022c6000b2ab400222bb8003f2ab40015c6000b2ab400152bb800432ab6002499000b2ab400122bb800432ab400082bb80044b1
@@ -1118,13 +1103,8 @@ fromData,24,2a2bb7001e2a2bb8001fb500042a2bb900200100b50002b1
 toData,24,2a2bb700212ab400042bb800222b2ab40002b900230200b1
 
 com/gemstone/gemfire/internal/cache/InitialImageOperation$RequestImageMessage,2
-<<<<<<< HEAD
 fromData,98,2a2bb700b42a2bb800b5b500172a2bb900b60100b500022a2bb900b70100b500552a2bb900b70100b500032a2bb900b70100b5004b2a2bb800b8c000b9b5003a2a2bb800b8c000bab500262a2bb800b8c000bbb5003b2a2bb800b8c000bcb50030b1
 toData,86,2a2bb700bd2ab400172bb800be2b2ab40002b900bf02002b2ab40055b900c002002b2ab40003b900c002002b2ab4004bb900c002002ab4003a2bb800c12ab400262bb800c12ab4003b2bb800c12ab400302bb800c1b1
-=======
-fromData,98,2a2bb700b22a2bb800b3b500172a2bb900b40100b500022a2bb900b50100b500542a2bb900b50100b500032a2bb900b50100b5004a2a2bb800b6c000b7b5003a2a2bb800b6c000b8b500262a2bb800b6c000b9b5003b2a2bb800b6c000bab50030b1
-toData,86,2a2bb700bb2ab400172bb800bc2b2ab40002b900bd02002b2ab40054b900be02002b2ab40003b900be02002b2ab4004ab900be02002ab4003a2bb800bf2ab400262bb800bf2ab4003b2bb800bf2ab400302bb800bfb1
->>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/InitialImageOperation$RequestRVVMessage,2
 fromData,34,2a2bb7001e2a2bb8001fb500052a2bb900200100b500022a2bb900210100b50003b1
@@ -1139,13 +1119,8 @@ fromData,33,2a2bb80010b500052a2bb80011b500062a2bb80012b500072a2bb80013b50008b1
 toData,36,2ab400052bb8000b2ab40006c0000c2bb8000d2ab400072bb8000e2ab400082bb8000fb1
 
 com/gemstone/gemfire/internal/cache/InvalidateOperation$InvalidateMessage,2
-<<<<<<< HEAD
 fromData,25,2a2bb700282a2bb80029c0002ab500022a2bb80029b50015b1
 toData,22,2a2bb7002b2ab400022bb8002c2ab400152bb8002cb1
-=======
-fromData,25,2a2bb700292a2bb8002ac0002bb500022a2bb8002ab50016b1
-toData,22,2a2bb7002c2ab400022bb8002d2ab400162bb8002db1
->>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/InvalidateOperation$InvalidateWithContextMessage,2
 fromData,14,2a2bb7000c2a2bb8000db50004b1
@@ -1255,13 +1230,8 @@ fromData,52,2a2bb700242bb9002501003d1c047e99000704a70004033e1c057e99000704a70004
 toData,57,2a2bb70020033d2ab40003c600081c0480913d2ab40003c100219900081c0580913d2b1cb9002202002ab40003c6000b2ab400032bb80023b1
 
 com/gemstone/gemfire/internal/cache/RemoteOperationMessage,2
-<<<<<<< HEAD
 fromData,43,2a2bb7005a2a2bb9005b0100b5005c2a2ab4005c2bb6005d2a2bb8005eb5000a2a2bb9005f0100b50006b1
 toData,103,2a2bb700602ab600613d2b1cb9006202002ab4000c99000d2b2ab4000cb9006302002ab4006499000d2b2ab40064b9006502002ab60015029f000d2b2ab60015b9006302002ab60016c6000b2ab600162bb800662ab4000a2bb800672b2ab40006b900680200b1
-=======
-fromData,43,2a2bb700592a2bb9005a0100b5005b2a2ab4005b2bb6005c2a2bb8005db5000a2a2bb9005e0100b50006b1
-toData,103,2a2bb7005f2ab600603d2b1cb9006102002ab4000c99000d2b2ab4000cb9006202002ab4006399000d2b2ab40063b9006402002ab60015029f000d2b2ab60015b9006202002ab60016c6000b2ab600162bb800652ab4000a2bb800662b2ab40006b900670200b1
->>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/RemotePutAllMessage,2
 fromData,223,2a2bb700502a2bb80051c00052b500382a2bb80051b5003a2a2ab4005310087e99000704a7000403b500052ab4005310407e99000e2a2bb80051c00054b5004e2a2ab400531100807e99000704a7000403b500042a2bb8005588b500072a2ab40007bd0056b500062ab400079e00722bb800574dbb005859b700594e03360415042ab40007a200202ab400061504bb0056592b2ab4003815042c2db7005a53840401a7ffdd2bb9005b01003604150499002f2bb8005c3a0503360615062ab40007a2001d2ab4000615063219051506b6005dc0001fb50020840601a7ffe0b1
@@ -1444,13 +1414,8 @@ fromData,62,2a2bb700292a2bb8002ab500082a2bb9002b0100b500022ab40002b8002c2a2bb800
 toData,52,2a2bb7002f2ab400082bb800302b2ab40002b9003102002ab400052bb800322b2ab40003b9003302002b2ab40004b900330200b1
 
 com/gemstone/gemfire/internal/cache/UpdateEntryVersionOperation$UpdateEntryVersionMessage,2
-<<<<<<< HEAD
 fromData,45,2a2bb7002e2a2bb8002fc00030b500022a2bb8002fb500092bb800314d2cb6003299000b2a2bb80033b50005b1
 toData,118,2a2bb700342ab400022bb800352ab400092bb800352ab40003b60036c0001b4d2cc1003799002e2cb600384e2db60039990018b2003a2bb8003b2ab40003b6003c2bb8003da7000ab2003e2bb8003ba700262cb6003f990018b2003a2bb8003b2ab40003b6003c2bb8003da7000ab2003e2bb8003bb1
-=======
-fromData,45,2a2bb7002f2a2bb80030c00031b500022a2bb80030b500092bb800324d2cb6003399000b2a2bb80034b50005b1
-toData,118,2a2bb700352ab400022bb800362ab400092bb800362ab40003b60037c0001b4d2cc1003899002e2cb600394e2db6003a990018b2003b2bb8003c2ab40003b6003d2bb8003ea7000ab2003f2bb8003ca700262cb60040990018b2003b2bb8003c2ab40003b6003d2bb8003ea7000ab2003f2bb8003cb1
->>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/UpdateOperation$UpdateMessage,2
 fromData,144,2a2bb700692bb9006a01003d1cb2006b7e99000704a70004033e1d9900332abb006c59b7006db500042ab400042bb8006e2bb9006f0100360415049900102a2bb900700100b80006b50007a700082a01b500042a2bb80071b5000d2a1cb200727e91b5000a2ab6002899000e2a2bb80073b50026a7001b2a2bb80073b5000f1cb200747e99000b2a2bb80073b50026b1
@@ -1587,13 +1552,8 @@ fromData,6,2a2bb7001db1
 toData,6,2a2bb7001bb1
 
 com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage,2
-<<<<<<< HEAD
 fromData,134,2a2bb700662a2bb80067b700682a2bb80067b500092a2bb900690100b8006ab5000b2a2bb9006b0100b5000c2a2bb8006cb5000e2a2bb80067c0006db500192a2bb80067c0006eb500102a2bb80067b500052ab4006f1104007e99000704a70004033d1c9900162abb007059b70071b500722ab400722bb800732a2bb80067c00074b50012b1
 toData,100,2a2bb700752ab600762bb800772ab400092bb800772b2ab4000bb40078b9007902002b2ab4000cb9007a02002ab4000e2bb800772ab400192bb800772ab400102bb800772ab400052bb800772ab40072c6000b2ab400722bb8007b2ab400122bb80077b1
-=======
-fromData,134,2a2bb700652a2bb80066b700672a2bb80066b500092a2bb900680100b80069b5000b2a2bb9006a0100b5000c2a2bb8006bb5000e2a2bb80066c0006cb500192a2bb80066c0006db500102a2bb80066b500052ab4006e1104007e99000704a70004033d1c9900162abb006f59b70070b500712ab400712bb800722a2bb80066c00073b50012b1
-toData,100,2a2bb700742ab600752bb800762ab400092bb800762b2ab4000bb40077b9007802002b2ab4000cb9007902002ab4000e2bb800762ab400192bb800762ab400102bb800762ab400052bb800762ab40071c6000b2ab400712bb8007a2ab400122bb80076b1
->>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/partitioned/DestroyMessage$DestroyReplyMessage,2
 fromData,52,2a2bb700252bb9002601003d1c047e99000704a70004033e1c057e99000704a700040336041d99000d2a15042bb80027b5000bb1
@@ -1664,13 +1624,8 @@ fromData,36,2a2bb700252a2bb900260100b500022a2bb900260100b500032a2bb900260100b500
 toData,36,2a2bb700272b2ab40002b9002802002b2ab40003b9002802002b2ab40004b900280200b1
 
 com/gemstone/gemfire/internal/cache/partitioned/GetMessage,2
-<<<<<<< HEAD
 fromData,43,2a2bb700502a2bb80051b500052a2bb80051b500062a2bb80051c00052b500072a2bb900530100b50008b1
 toData,40,2a2bb700542ab400052bb800552ab400062bb800552ab400072bb800552b2ab40008b900560200b1
-=======
-fromData,43,2a2bb700512a2bb80052b500052a2bb80052b500062a2bb80052c00053b500072a2bb900540100b50008b1
-toData,40,2a2bb700552ab400052bb800562ab400062bb800562ab400072bb800562b2ab40008b900570200b1
->>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/partitioned/GetMessage$GetReplyMessage,2
 fromData,77,2a2bb700292bb9002a01003d1c10087e99000704a7000403593e9900091c10f77e913d2a1cb500072a2bb8002bb5002c1c049f000b2a2bb8002db5002e1d99000e2a2bb8002fc00030b5000ab1
@@ -1757,13 +1712,8 @@ fromData,49,2a2bb700362a2bb80037b500062a2bb900380100b80039b500082a2bb80037c0003a
 toData,43,2a2bb7003c2ab7000f2bb8003d2b2ab40008b4003eb9003f02002ab4000a2bb8003d2ab4000c2bb8003db1
 
 com/gemstone/gemfire/internal/cache/partitioned/PartitionMessage,2
-<<<<<<< HEAD
 fromData,58,2a2bb7007b2a2bb9007c0100b500052a2ab400052bb6007d2a2bb9007e0100b5000e2bb8007fb20080b600819b000d2a2bb900820100b5000ab1
 toData,104,2a2bb70086033d2a1cb600873d2b1cb9008802002ab4001099000d2b2ab40010b9008902002ab40008029f000d2b2ab40008b9008902002ab40006c6000b2ab400062bb8008a2b2ab4000eb9008902002bb8008bb20080b600819b000d2b2ab4000ab9008c0200b1
-=======
-fromData,58,2a2bb7007a2a2bb9007b0100b500052a2ab400052bb6007c2a2bb9007d0100b5000e2bb8007eb2007fb600809b000d2a2bb900810100b5000ab1
-toData,104,2a2bb70085033d2a1cb600863d2b1cb9008702002ab4001099000d2b2ab40010b9008802002ab40008029f000d2b2ab40008b9008802002ab40006c6000b2ab400062bb800892b2ab4000eb9008802002bb8008ab2007fb600809b000d2b2ab4000ab9008b0200b1
->>>>>>> GEODE-1372 Updated analyzeSerializable test and headers.
 
 com/gemstone/gemfire/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage,2
 fromData,17,2a2bb7003c2a2bb8003dc0003eb50003b1


Mime
View raw message