From 2f49ed7ea3649a51a9457b99004c8cb0ca443432 Mon Sep 17 00:00:00 2001
From: wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 13 Mar 2009 10:58:21 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@321
 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

---
 .../java/at/gv/egiz/bku/local/ui/TrayIconDialog.java     |  4 ++--
 .../egiz/bku/utils/urldereferencer/URLDereferencer.java  |  4 +++-
 .../java/at/gv/egiz/urldereferencer/FormDataTest.java    | 16 ++++++++++++----
 3 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'utils')

diff --git a/utils/src/main/java/at/gv/egiz/bku/local/ui/TrayIconDialog.java b/utils/src/main/java/at/gv/egiz/bku/local/ui/TrayIconDialog.java
index c7aae215..fef113fd 100644
--- a/utils/src/main/java/at/gv/egiz/bku/local/ui/TrayIconDialog.java
+++ b/utils/src/main/java/at/gv/egiz/bku/local/ui/TrayIconDialog.java
@@ -151,12 +151,12 @@ public class TrayIconDialog implements TrayIconDialogInterface {
   public synchronized static TrayIconDialogInterface getInstance() {
     ClassLoader cl = TrayIconDialog.class.getClassLoader();
     if (instance == null) {
-      if (cl.toString().startsWith("sun.")) {
+      if (cl.toString().equals(cl.getParent().toString())) {
         instance = new TrayIconDialog();
         return instance;
       }
       ClassLoader parent = cl;
-      while (!parent.toString().startsWith("sun.")) {
+      while (!parent.toString().equals(cl.getParent().toString())) {
         parent = parent.getParent();
       }
       try {
diff --git a/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URLDereferencer.java b/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URLDereferencer.java
index 8853a9c1..7361ec26 100644
--- a/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URLDereferencer.java
+++ b/utils/src/main/java/at/gv/egiz/bku/utils/urldereferencer/URLDereferencer.java
@@ -54,7 +54,9 @@ public class URLDereferencer {
    *          must not be null
    * @param aContext
    * @throws MalformedURLException
-   *           if the protocol is not supported
+   *           if the protocol is not supported
+   * @throws IOException if the url cannot be dereferenced (e.g. formdata not provided)
+   *           
    */
   public StreamData dereference(String aUrl, URLDereferencerContext aContext)
       throws IOException {
diff --git a/utils/src/test/java/at/gv/egiz/urldereferencer/FormDataTest.java b/utils/src/test/java/at/gv/egiz/urldereferencer/FormDataTest.java
index 1e0ce916..ecd4c8f7 100644
--- a/utils/src/test/java/at/gv/egiz/urldereferencer/FormDataTest.java
+++ b/utils/src/test/java/at/gv/egiz/urldereferencer/FormDataTest.java
@@ -77,12 +77,20 @@ public class FormDataTest implements FormDataURLSupplier {
   @Test
   public void testFormData() throws IOException {
     paramName = "Müllcontainer";
+    testStream = new ByteArrayInputStream("HelloWorld".getBytes("UTF-8"));
     String url = "formdata:"+paramName;
     StreamData sd = URLDereferencer.getInstance().dereference(url, urlCtx);
-    assertNull(sd);
-    testStream = new ByteArrayInputStream("HelloWorld".getBytes("UTF-8"));
-    sd = URLDereferencer.getInstance().dereference(url, urlCtx);
+    assertNotNull(sd);
     String result = StreamUtil.asString(sd.getStream(), "UTF-8");
     assertEquals("HelloWorld", result);
-  }
+  }
+  
+  @Test(expected=IOException.class)
+  public void testFormDataNotFound() throws IOException {
+    paramName = "Müllcontainer";
+    testStream = new ByteArrayInputStream("HelloWorld".getBytes("UTF-8"));
+    String url = "formdata:"+paramName+"2";
+    StreamData sd = URLDereferencer.getInstance().dereference(url, urlCtx);
+  }
+  
 }
-- 
cgit v1.2.3