From 30cfedc8f9d0fcaa0378005c9a0ca38930bf946b Mon Sep 17 00:00:00 2001
From: Adam Domurad <adomurad@redhat.com>
Date: Thu, 28 Mar 2013 14:40:11 -0400
Subject: Move normalizeUrlAndStripParams to UrlUtils

---
 netx/net/sourceforge/jnlp/util/UrlUtils.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'netx/net/sourceforge/jnlp/util/UrlUtils.java')

diff --git a/netx/net/sourceforge/jnlp/util/UrlUtils.java b/netx/net/sourceforge/jnlp/util/UrlUtils.java
index 403b977..a043bb0 100644
--- a/netx/net/sourceforge/jnlp/util/UrlUtils.java
+++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java
@@ -37,10 +37,27 @@ exception statement from your version.
 
 package net.sourceforge.jnlp.util;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
 import java.net.URL;
 
+import net.sourceforge.jnlp.cache.ResourceTracker;
+
 public class UrlUtils {
 
+    public static URL normalizeUrlAndStripParams(URL url) {
+        try {
+            String[] urlParts = url.toString().split("\\?");
+            URL strippedUrl = new URL(urlParts[0]); 
+            return ResourceTracker.normalizeUrl(strippedUrl, false);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+        }
+        return url;
+    }
+
     public static boolean isLocalFile(URL url) {
 
         if (url.getProtocol().equals("file") &&
-- 
cgit v1.2.3