From 1d1014849128e2f980f596a225152d777b93b16f Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Fri, 9 Jul 2010 12:15:42 +0000
Subject: [PATCH] [LMS-1601] fixed (don't encode "/" in URLs)
SVN: 16961
---
.../openbis/dss/generic/server/HTMLDirectoryRenderer.java | 4 ++--
.../dss/generic/server/SimpleHTMLDirectoryRenderer.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLDirectoryRenderer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLDirectoryRenderer.java
index f81a9fc3fce..79cdabd80fa 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLDirectoryRenderer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLDirectoryRenderer.java
@@ -27,8 +27,8 @@ import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.common.utilities.Template;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Space;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Project;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Space;
/**
* An <code>IDirectoryRenderer</code> implementation which renders on HTML pages.
@@ -190,7 +190,7 @@ final class HTMLDirectoryRenderer implements IDirectoryRenderer
{
try
{
- return URLEncoder.encode(url, "UTF-8");
+ return URLEncoder.encode(url, "UTF-8").replace("%2F", "/");
} catch (final UnsupportedEncodingException ex)
{
throw CheckedExceptionTunnel.wrapIfNecessary(ex);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java
index 001be6c0d66..5e1ef98dbc6 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java
@@ -120,7 +120,7 @@ final class SimpleHTMLDirectoryRenderer implements IDirectoryRenderer
{
try
{
- return URLEncoder.encode(url, "UTF-8");
+ return URLEncoder.encode(url, "UTF-8").replace("%2F", "/");
} catch (final UnsupportedEncodingException ex)
{
throw CheckedExceptionTunnel.wrapIfNecessary(ex);
--
GitLab