From db7db678511d2f889262a59d78b6740e772b6063 Mon Sep 17 00:00:00 2001 From: Kaori Hagihara Date: Tue, 25 Oct 2011 22:16:56 +0000 Subject: fixed client viewer to be compatible with server response header both Content-type and Content-Type --- applications/jpip/CHANGES | 1 + .../jpip/util/opj_viewer/dist/opj_viewer-20111018.jar | Bin 15873 -> 0 bytes .../jpip/util/opj_viewer/dist/opj_viewer-20111026.jar | Bin 0 -> 15894 bytes applications/jpip/util/opj_viewer/dist/opj_viewer.jar | 2 +- .../jpip/util/opj_viewer/src/JPIPHttpClient.java | 4 +++- .../dist/opj_viewer_xerces-20111010.jar | Bin 20390 -> 0 bytes .../dist/opj_viewer_xerces-20111026.jar | Bin 0 -> 20411 bytes .../util/opj_viewer_xerces/dist/opj_viewer_xerces.jar | 2 +- 8 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 applications/jpip/util/opj_viewer/dist/opj_viewer-20111018.jar create mode 100644 applications/jpip/util/opj_viewer/dist/opj_viewer-20111026.jar delete mode 100644 applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces-20111010.jar create mode 100644 applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces-20111026.jar diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES index c58cc5e7..f926b5b3 100644 --- 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-20111018.jar deleted file mode 100644 index a17ca3b6..00000000 Binary files a/applications/jpip/util/opj_viewer/dist/opj_viewer-20111018.jar and /dev/null differ diff --git a/applications/jpip/util/opj_viewer/dist/opj_viewer-20111026.jar b/applications/jpip/util/opj_viewer/dist/opj_viewer-20111026.jar new file mode 100644 index 00000000..a1b6789a Binary files /dev/null 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 b135bb0f..4fceec6d 120000 --- 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 eee20f71..e4c86a97 100644 --- 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-20111010.jar deleted file mode 100644 index e2f78889..00000000 Binary files a/applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces-20111010.jar and /dev/null differ diff --git a/applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces-20111026.jar b/applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces-20111026.jar new file mode 100644 index 00000000..f67cfb5b Binary files /dev/null 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 8fbb188c..f1df7c26 120000 --- 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 -- cgit v1.2.3