fixed client viewer to be compatible with server response header both Content-type...

diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES
index c58cc5e76aaad68bd8b6d73d4fc50c6d67178901..f926b5b34664e01fa05857205f4e8dd7bc24bb87 100644 (file)
--- a/applications/jpip/CHANGES
+++ b/applications/jpip/CHANGES
@@ -7,6 +7,7 @@ What's New for OpenJPIP
 
 October 25, 2011
 * [kaori] patches for cmake and autotool are applied
+* [kaori] fixed client viewer to be compatible with server response header both Content-type and Content-Type
 
 October 20, 2011
 + [added] API style in openJPIP library

diff --git a/applications/jpip/util/opj_viewer/dist/opj_viewer-20111018.jar b/applications/jpip/util/opj_viewer/dist/opj_viewer-20111026.jar
similarity index 61%
rename from applications/jpip/util/opj_viewer/dist/opj_viewer-20111018.jar
rename to applications/jpip/util/opj_viewer/dist/opj_viewer-20111026.jar
index a17ca3b6a28603bc30d6f3ab53102e37b5e31203..a1b6789a62e3c93a9a4652d2f35dd6dbc5f0e2aa 100644 (file)
Binary files a/applications/jpip/util/opj_viewer/dist/opj_viewer-20111018.jar and b/applications/jpip/util/opj_viewer/dist/opj_viewer-20111026.jar differ

diff --git a/applications/jpip/util/opj_viewer/dist/opj_viewer.jar b/applications/jpip/util/opj_viewer/dist/opj_viewer.jar
index b135bb0f327da642c0383ba25038e8f723c8b64f..4fceec6d264776ac35432d3d7e831e852a5d4a65 120000 (symlink)
--- a/applications/jpip/util/opj_viewer/dist/opj_viewer.jar
+++ b/applications/jpip/util/opj_viewer/dist/opj_viewer.jar
@@ -1 +1 @@
-opj_viewer-20111018.jar
\ No newline at end of file
+opj_viewer-20111026.jar
\ No newline at end of file

diff --git a/applications/jpip/util/opj_viewer/src/JPIPHttpClient.java b/applications/jpip/util/opj_viewer/src/JPIPHttpClient.java
index eee20f7141032e077bd420f79005c3a41fe3e25f..e4c86a97c3d29e382f4afaaa3ef41d8a5fcb1989 100644 (file)
--- a/applications/jpip/util/opj_viewer/src/JPIPHttpClient.java
+++ b/applications/jpip/util/opj_viewer/src/JPIPHttpClient.java
@@ -178,7 +178,9 @@ public class JPIPHttpClient
            if( !status.contains("OK"))
                System.err.println( headers.get("Reason"));
            
-           hvalueline = headers.get("Content-type").get(0);
+           if(( hvaluelist = headers.get("Content-type")) == null)
+               hvaluelist = headers.get("Content-Type");
+           hvalueline = hvaluelist.get(0);
            System.err.println( hvalueline);
 
            if( hvalueline.endsWith("jpt-stream"))

diff --git a/applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces-20111010.jar b/applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces-20111026.jar
similarity index 76%
rename from applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces-20111010.jar
rename to applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces-20111026.jar
index e2f78889c4b534474ce2df0b623a844211eb2857..f67cfb5b9731d85d357c003921226d0e90a71ddc 100644 (file)
Binary files a/applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces-20111010.jar and b/applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces-20111026.jar differ

diff --git a/applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces.jar b/applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces.jar
index 8fbb188c1071ff176f5fb6923ea24b12f80af334..f1df7c261cea1697b504beaea9822662f397d57c 120000 (symlink)
--- a/applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces.jar
+++ b/applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces.jar
@@ -1 +1 @@
-opj_viewer_xerces-20111010.jar
\ No newline at end of file
+opj_viewer_xerces-20111026.jar
\ No newline at end of file