Alexander Wels has uploaded a new change for review.
Change subject: userportal,webadmin: Remove Java 7 construct in Frontend
......................................................................
userportal,webadmin: Remove Java 7 construct in Frontend
- Frontend does not allow Java 7 constructs, so replaced it with
a standard java 6 version.
Change-Id: I79d7a8cff2cfbc8ea424b3f67266d34dbeb24b9a
Signed-off-by: Alexander Wels <aw...@redhat.com>
---
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServlet.java
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/16038/1
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServlet.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServlet.java
index 117cd5f..a728b7f 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServlet.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/BrandingServlet.java
@@ -2,7 +2,6 @@
import java.io.File;
import java.io.IOException;
-import java.nio.file.FileSystems;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -104,8 +103,7 @@
*/
String getFullPath(final File brandingRootPath, final String path) {
String result = null;
- String mergedPath =
FileSystems.getDefault().getPath(brandingRootPath.getAbsolutePath(),
- path == null ? "": path).toString();
+ String mergedPath = new File(brandingRootPath.getAbsolutePath(), path
== null ? "": path).getAbsolutePath();
if (path != null && ServletUtils.isSane(mergedPath)) {
// Return a result relative to the branding root path.
result = mergedPath;
--
To view, visit http://gerrit.ovirt.org/16038
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79d7a8cff2cfbc8ea424b3f67266d34dbeb24b9a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <aw...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
