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 2016/04/28 14:28:57 UTC
camel git commit: CAMEL-7443: camel-printer to better find remote
printer where forward/backward slashes do not care.
Repository: camel
Updated Branches:
refs/heads/master 1fb67d6b8 -> ef74ad512
CAMEL-7443: camel-printer to better find remote printer where forward/backward slashes do not care.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef74ad51
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef74ad51
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef74ad51
Branch: refs/heads/master
Commit: ef74ad512a44f94f0ebe58670419c5d914cadfb3
Parents: 1fb67d6
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 28 14:27:55 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 28 14:28:50 2016 +0200
----------------------------------------------------------------------
.../camel/component/printer/PrinterProducer.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ef74ad51/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
index ee3239c..ea8fd99 100644
--- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
+++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterProducer.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.printer;
import java.io.InputStream;
-
+import java.util.Locale;
import javax.print.DocFlavor;
import javax.print.PrintException;
import javax.print.PrintService;
@@ -121,7 +121,7 @@ public class PrinterProducer extends DefaultProducer {
// no hostname for localhost printers
name = config.getPrintername();
} else {
- name = "\\\\" + config.getHostname() + "\\" + config.getPrintername();
+ name = config.getHostname() + "/" + config.getPrintername();
if (config.getPrinterPrefix() != null) {
name = config.getPrinterPrefix() + name;
}
@@ -139,8 +139,16 @@ public class PrinterProducer extends DefaultProducer {
private int findPrinter(PrintService[] services, String printer) {
int position = -1;
+ // align slashes so we match / or \
+ printer = printer.toLowerCase(Locale.US);
+ printer = printer.replace('\\', '/');
for (int i = 0; i < services.length; i++) {
- if (services[i].getName().toLowerCase().endsWith(printer.toLowerCase())) {
+ String printerName = services[i].getName();
+ log.debug("Printer service printer name: {}", printerName);
+ // align slashes so we match / or \
+ printerName = printerName.toLowerCase(Locale.US);
+ printerName = printerName.replace('\\', '/');
+ if (printerName.endsWith(printer)) {
position = i;
break;
}