You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/10/01 10:34:37 UTC

svn commit: r1177945 - in /camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer: PrinterConfiguration.java PrinterProducer.java

Author: davsclaus
Date: Sat Oct  1 08:34:36 2011
New Revision: 1177945

URL: http://svn.apache.org/viewvc?rev=1177945&view=rev
Log:
CAMEL-4477: Fixed issue with setting printername having leading slashes.

Modified:
    camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
    camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java

Modified: camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java?rev=1177945&r1=1177944&r2=1177945&view=diff
==============================================================================
--- camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java (original)
+++ camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterConfiguration.java Sat Oct  1 08:34:36 2011
@@ -23,9 +23,8 @@ import javax.print.DocFlavor;
 import javax.print.attribute.standard.MediaSizeName;
 import javax.print.attribute.standard.Sides;
 
+import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.URISupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class PrinterConfiguration {
     private URI uri;
@@ -59,7 +58,12 @@ public class PrinterConfiguration {
         setUri(uri);
         setHostname(uri.getHost());
         setPort(uri.getPort());
-        setPrintername(uri.getPath());
+
+        // use path as printer name, but without any leading slashes
+        String path = uri.getPath();
+        path = ObjectHelper.removeStartingCharacters(path, '/');
+        path = ObjectHelper.removeStartingCharacters(path, '\\');
+        setPrintername(path);
         
         Map printSettings = URISupport.parseParameters(uri);
         setFlavor((String)printSettings.get("flavor"));

Modified: camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java?rev=1177945&r1=1177944&r2=1177945&view=diff
==============================================================================
--- camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java (original)
+++ camel/trunk/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java Sat Oct  1 08:34:36 2011
@@ -83,7 +83,7 @@ public class PrinterProducer extends Def
         PrintService printService;
         
         if ((config.getHostname().equalsIgnoreCase("localhost")) 
-            && (config.getPrintername().equalsIgnoreCase("/default"))) {
+            && (config.getPrintername().equalsIgnoreCase("default"))) {
             printService = PrintServiceLookup.lookupDefaultPrintService();            
         } else {
             PrintService[] services = PrintServiceLookup.lookupPrintServices(null, null);