From 437d34636b0642d119e8c185040cd41f17ef2e95 Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Sun, 27 Jan 2013 20:54:31 +0000 Subject: [PATCH] - make AssetKey not flatten relative paths git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10205 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/core/com/jme3/asset/AssetKey.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/engine/src/core/com/jme3/asset/AssetKey.java b/engine/src/core/com/jme3/asset/AssetKey.java index 66bd3ffd0..a266bd74c 100644 --- a/engine/src/core/com/jme3/asset/AssetKey.java +++ b/engine/src/core/com/jme3/asset/AssetKey.java @@ -152,9 +152,10 @@ public class AssetKey implements Savable, Cloneable { if (string.length() == 0 || string.equals(".")) { //do nothing } else if (string.equals("..")) { - if (list.size() > 0) { + if (list.size() > 0 && !list.getLast().equals("..")) { list.removeLast(); } else { + list.add(".."); Logger.getLogger(AssetKey.class.getName()).log(Level.SEVERE, "Asset path is outside assetmanager root"); } } else {