svn commit: r1424223 - in /avro/trunk: CHANGES.txt lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslDigestMd5.java

[cutting]

Author: cutting
Date: Wed Dec 19 23:38:07 2012
New Revision: 1424223

URL: http://svn.apache.org/viewvc?rev=1424223&view=rev
Log:
AVRO-1221. Java: Fix TestSaslDigestMd5 to pass on IBM JVM.  Contributed by 
Rodrigo Trujillo.

Modified:
    avro/trunk/CHANGES.txt
    
avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslDigestMd5.java

Modified: avro/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1424223&r1=1424222&r2=1424223&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Wed Dec 19 23:38:07 2012
@@ -9,6 +9,9 @@ Trunk (not yet released)
     AVRO-1211. Add MR guide to documentation. (Skye Wanderman-Milne via
     tomwhite)
 
+    AVRO-1221. Java: Fix TestSaslDigestMd5 to pass on IBM JVM.
+    (Rodrigo Trujillo via cutting)
+
   BUG FIXES
 
 Avro 1.7.3 (6 December 2012)

Modified: 
avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslDigestMd5.java
URL: 
http://svn.apache.org/viewvc/avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslDigestMd5.java?rev=1424223&r1=1424222&r2=1424223&view=diff
==============================================================================
--- 
avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslDigestMd5.java
 (original)
+++ 
avro/trunk/lang/java/ipc/src/test/java/org/apache/avro/ipc/TestSaslDigestMd5.java
 Wed Dec 19 23:38:07 2012
@@ -64,7 +64,11 @@ public class TestSaslDigestMd5 extends T
 
   static {
     DIGEST_MD5_PROPS.put(Sasl.QOP, "auth-int");
-    DIGEST_MD5_PROPS.put("com.sun.security.sasl.digest.realm", REALM);
+    if (System.getProperty("java.vendor").contains("IBM")) {
+      DIGEST_MD5_PROPS.put("com.ibm.security.sasl.digest.realm", REALM);
+    } else {
+      DIGEST_MD5_PROPS.put("com.sun.security.sasl.digest.realm", REALM);
+    }
   }
 
   private static class TestSaslCallbackHandler implements CallbackHandler {