litesoft

Explore

Commits

Diff Revisions 810 vs 811 for /trunk/Java/core/Server/src/org/litesoft/util/Utils.java

		@@ -197,7 +197,7 @@
197	197
198	198		public static String relativePath( String pBasePath, String pPossibleRelativePath )
199	199		{
200		-	if ( (pPossibleRelativePath == null) \|\| (pPossibleRelativePath.indexOf( ':' ) != -1) \|\| isPathSep( pPossibleRelativePath.charAt( 0 ) ) )
	200	+	if ( (pPossibleRelativePath == null) \|\| (pPossibleRelativePath.indexOf( ':' ) != -1) \|\| Characters.isPathSep( pPossibleRelativePath.charAt( 0 ) ) )
201	201		{
202	202		return pPossibleRelativePath;
203	203		}
		@@ -584,8 +584,8 @@
584	584		{
585	585		break;
586	586		}
587		-	int zHi = UtilsCommon.hexFor( pURLtext.charAt( zAt + 1 ) );
588		-	int zLo = UtilsCommon.hexFor( pURLtext.charAt( zAt + 2 ) );
	587	+	int zHi = Hex.fromChar( pURLtext.charAt( zAt + 1 ) );
	588	+	int zLo = Hex.fromChar( pURLtext.charAt( zAt + 2 ) );
589	589		if ( (zHi != -1) && (zLo != -1) )
590	590		{
591	591		pURLtext = pURLtext.substring( 0, zAt ) + //