diff --git a/brouter-expressions/src/main/java/btools/expressions/BExpression.java b/brouter-expressions/src/main/java/btools/expressions/BExpression.java index 68ce6a2..5bd0ba9 100644 --- a/brouter-expressions/src/main/java/btools/expressions/BExpression.java +++ b/brouter-expressions/src/main/java/btools/expressions/BExpression.java @@ -141,8 +141,8 @@ final class BExpression { use of variable values assign no_height switch and not maxheight= - lesser v:maxheight my_height true - false + lesser v:maxheight my_height true + false */ if (operator.startsWith("v:")) { String name = operator.substring(2); diff --git a/brouter-expressions/src/test/java/btools/expressions/EncodeDecodeTest.java b/brouter-expressions/src/test/java/btools/expressions/EncodeDecodeTest.java index bdbc2be..d445c45 100644 --- a/brouter-expressions/src/test/java/btools/expressions/EncodeDecodeTest.java +++ b/brouter-expressions/src/test/java/btools/expressions/EncodeDecodeTest.java @@ -28,7 +28,7 @@ public class EncodeDecodeTest { "highway=residential", "oneway=yes", "depth=1'6\"", -// "depth=6 feet", +// "depth=6 feet", "maxheight=5.1m", "maxdraft=~3 mt", "reversedirection=yes" diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java index 38bb5f8..62c74e5 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -259,17 +259,17 @@ public class RouteServer extends Thread implements Comparable { } finally { cr = null; if (br != null) try { - br.close(); - } catch (Exception e) { - } + br.close(); + } catch (Exception e) { + } if (bw != null) try { - bw.close(); - } catch (Exception e) { - } + bw.close(); + } catch (Exception e) { + } if (clientSocket != null) try { - clientSocket.close(); - } catch (Exception e) { - } + clientSocket.close(); + } catch (Exception e) { + } terminated = true; synchronized (threadPoolSync) { threadPoolSync.notifyAll(); diff --git a/brouter-server/src/main/java/btools/server/request/ProfileUploadHandler.java b/brouter-server/src/main/java/btools/server/request/ProfileUploadHandler.java index 05dc138..4cc2138 100644 --- a/brouter-server/src/main/java/btools/server/request/ProfileUploadHandler.java +++ b/brouter-server/src/main/java/btools/server/request/ProfileUploadHandler.java @@ -59,9 +59,9 @@ public class ProfileUploadHandler { response.write(toJSON(responseData)); } finally { if (fileWriter != null) try { - fileWriter.close(); - } catch (Exception e) { - } + fileWriter.close(); + } catch (Exception e) { + } } }