pool: Fix regression causing FTP movers to default to proxy mode

A recent patch fixed a typo that had caused the pool.mover.ftp.allow-incoming-connections property to be ignored. Fixing the bug however revealed another bug that causes the interpretation of the property to be negated. Thus the mover defaulted to proxy mode. Target: trunk Request: 2.11 Request: 2.10 Request: 2.9 Request: 2.8 Request: 2.7 Require-notes: yes Require-book: no Acked-by: Paul Millar <paul.millar@desy.de> Patch: https://rb.dcache.org/r/7630/ (cherry picked from commit be20f11)
dCache · Jan 5, 2015 · 7e52c73 · 7e52c73
1 parent 1250ede
commit 7e52c73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/dcache-ftp/src/main/java/org/dcache/pool/movers/GFtpProtocol_2_nio.java b/modules/dcache-ftp/src/main/java/org/dcache/pool/movers/GFtpProtocol_2_nio.java
@@ -210,9 +210,9 @@ public GFtpProtocol_2_nio(CellEndpoint cell)
 
         if (_cell != null) {
             Args args = _cell.getArgs();
-            if (args.hasOption("ftpProxyPassive")) {
+            if (args.hasOption("ftpAllowIncomingConnections")) {
                 _allowPassivePool =
-                        !Boolean.parseBoolean(args.getOpt("ftpProxyPassive"));
+                        Boolean.parseBoolean(args.getOpt("ftpAllowIncomingConnections"));
             }
 
             if (args.hasOption("gsiftpBlockSize")) {

diff --git a/skel/share/services/pool.batch b/skel/share/services/pool.batch
@@ -90,7 +90,7 @@ create org.dcache.cells.UniversalSpringCell "${pool.cell.name}" \
     "!PoolDefaults classpath:org/dcache/pool/classic/pool.xml \
     -export=${pool.cell.export} -cellClass=Pool -profiles=healthcheck-${pool.enable.repository-check} \
     -setupClass=pool -setupFile=\"${pool.path}/setup\" \
-    -ftpProxyPassive=\"${pool.mover.ftp.allow-incoming-connections}\" \
+    -ftpAllowIncomingConnections=\"${pool.mover.ftp.allow-incoming-connections}\" \
     -allowMmap=\"${pool.mover.ftp.mmap}\" \
     -messageExecutor=messageThreadPool \
     -waitForFiles=\"${pool.wait-for-files}\" \