svn commit: r1525179 - in /hbase/trunk/hbase-server/src: main/java/org/apache/hadoop/hbase/rest/model/ test/java/org/apache/hadoop/hbase/rest/model/

[st...@apache.org]

Author: stack
Date: Fri Sep 20 23:33:37 2013
New Revision: 1525179

URL: http://svn.apache.org/r1525179
Log:
HBASE-9600 TestColumnSchemaModel and TestTableSchemaModel test cases are failing with IBM IBM Java 6

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java?rev=1525179&r1=1525178&r2=1525179&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ColumnSchemaModel.java Fri Sep 20 23:33:37 2013
@@ -20,7 +20,7 @@
 package org.apache.hadoop.hbase.rest.model;
 
 import java.io.Serializable;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import javax.xml.bind.annotation.XmlAnyAttribute;
@@ -57,7 +57,7 @@ public class ColumnSchemaModel implement
   private static QName VERSIONS = new QName(HConstants.VERSIONS);
 
   private String name;
-  private Map<QName,Object> attrs = new HashMap<QName,Object>();
+  private Map<QName,Object> attrs = new LinkedHashMap<QName,Object>();
 
   /**
    * Default constructor

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java?rev=1525179&r1=1525178&r2=1525179&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/TableSchemaModel.java Fri Sep 20 23:33:37 2013
@@ -22,7 +22,7 @@ package org.apache.hadoop.hbase.rest.mod
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -74,7 +74,7 @@ public class TableSchemaModel implements
     new QName(HColumnDescriptor.COMPRESSION);
 
   private String name;
-  private Map<QName,Object> attrs = new HashMap<QName,Object>();
+  private Map<QName,Object> attrs = new LinkedHashMap<QName,Object>();
   private List<ColumnSchemaModel> columns = new ArrayList<ColumnSchemaModel>();
   
   /**

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java?rev=1525179&r1=1525178&r2=1525179&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java Fri Sep 20 23:33:37 2013
@@ -59,13 +59,13 @@ public class TestColumnSchemaModel exten
   protected ColumnSchemaModel buildTestModel() {
     ColumnSchemaModel model = new ColumnSchemaModel();
     model.setName(COLUMN_NAME);
-    model.__setBlockcache(BLOCKCACHE);
     model.__setBlocksize(BLOCKSIZE);
     model.__setBloomfilter(BLOOMFILTER);
+    model.__setBlockcache(BLOCKCACHE);
     model.__setCompression(COMPRESSION);
-    model.__setInMemory(IN_MEMORY);
-    model.__setTTL(TTL);
     model.__setVersions(VERSIONS);
+    model.__setTTL(TTL);
+    model.__setInMemory(IN_MEMORY);
     return model;
   }