Attachment #29384 for bug #53854

View | Details | Raw Unified | Return to bug 53854
Collapse All | Expand All

Lines 1614-1620 Link Here

(-)java/org/apache/naming/resources/BaseDirContext.java (-2 / +2 lines)
1614	protected abstract String doGetRealPath(String name);	1614	protected abstract String doGetRealPath(String name);
1615		1615
1616	// -------------------------------------------------------- Private Methods	1616	// -------------------------------------------------------- Private Methods
1617	private AliasResult findAlias(String name) {	1617	protected AliasResult findAlias(String name) {
1618	AliasResult result = new AliasResult();	1618	AliasResult result = new AliasResult();
1619		1619
1620	String searchName = name;	1620	String searchName = name;
Lines 1634-1640 Link Here
1634	return result;	1634	return result;
1635	}	1635	}
1636		1636
1637	private static class AliasResult {	1637	protected static class AliasResult {
1638	BaseDirContext dirContext;	1638	BaseDirContext dirContext;
1639	String aliasName;	1639	String aliasName;
1640	}	1640	}




                if (!canPath.equals(absPath))
                    return null;
            }
            
			return file;
            return null;
        }
        
        // Is this an alias
        if (!aliases.isEmpty()) {
            AliasResult result = findAlias(name);
            if (result.dirContext != null) {
                file = new File(result.dirContext.doGetRealPath(result.aliasName));
                if (file.exists() && file.canRead())
                	return file;
            }
        }
        
        return null;
    }



Return to bug 53854

Lines 834-845 Link Here

(-)java/org/apache/naming/resources/FileDirContext.java (-5 / +14 lines)
834	if (!canPath.equals(absPath))	834	if (!canPath.equals(absPath))
835	return null;	835	return null;
836	}	836	}
837		837
838	} else {	838	return file;
839	return null;
840	}	839	}
841	return file;	840
842		841	// Is this an alias
		842	if (!aliases.isEmpty()) {
		843	AliasResult result = findAlias(name);
		844	if (result.dirContext != null) {
		845	file = new File(result.dirContext.doGetRealPath(result.aliasName));
		846	if (file.exists() && file.canRead())
		847	return file;
		848	}
		849	}
		850
		851	return null;
843	}	852	}
844		853
845		854