You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2006/12/08 21:24:35 UTC
svn commit: r484743 - in
/webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util:
FileUtils.java LoggingUtils.java
Author: danj
Date: Fri Dec 8 12:24:34 2006
New Revision: 484743
URL: http://svn.apache.org/viewvc?view=rev&rev=484743
Log:
Part of fix for MUSE-100
Modified:
webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/FileUtils.java
webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/LoggingUtils.java
Modified: webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/FileUtils.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/FileUtils.java?view=diff&rev=484743&r1=484742&r2=484743
==============================================================================
--- webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/FileUtils.java (original)
+++ webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/FileUtils.java Fri Dec 8 12:24:34 2006
@@ -302,6 +302,12 @@
throw new NullPointerException(_MESSAGES.get("NullRelativePath"));
//
+ // remove ./ if present
+ //
+ if (relativePath.startsWith("./"))
+ relativePath = relativePath.substring(2);
+
+ //
// remove any .. reference by taking off the last section/ of
// the original path
//
Modified: webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/LoggingUtils.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/LoggingUtils.java?view=diff&rev=484743&r1=484742&r2=484743
==============================================================================
--- webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/LoggingUtils.java (original)
+++ webservices/muse/trunk/modules/muse-util/src/org/apache/muse/util/LoggingUtils.java Fri Dec 8 12:24:34 2006
@@ -104,7 +104,15 @@
for (int n = 0; n < parameters.length; ++n)
{
- buffer.append(parameters[n].getClass().getName());
+ String type = null;
+
+ if (parameters[n] == null)
+ type = "null (no type)";
+
+ else
+ type = parameters[n].getClass().getName();
+
+ buffer.append(type);
if (n != parameters.length - 1)
buffer.append(", ");
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org