X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.detached%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fdetached%2Fdrivers%2FFileDriver.java;h=4e1cef4c387158dcace2d4e4657e97311830932a;hb=a0a151ee3a0aed29a3cb03d81e35d540ca9fdb03;hp=06475f46a9835dc7d6bc4d4a1198a08290676237;hpb=5fe677bf811739592b1089471181e39f9cbe4f3f;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java b/runtime/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java index 06475f46a..4e1cef4c3 100644 --- a/runtime/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java +++ b/runtime/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java @@ -71,12 +71,12 @@ public class FileDriver implements DetachedClient, DetachedDriver, // Counters to avoid naming files with same prefix private long lastSentTime = 0; private int counter = 0; - - private DetachedXmlConverter xmlConverter = null; - + + private DetachedXmlConverter xmlConverter = null; + private long receiveAnswerTimeout = 10000l; - - private boolean active = true; + + private boolean active = true; public synchronized DetachedRequest receiveRequest() throws Exception { DetachedRequest request = (DetachedRequest) receiveFile(requestsDir, @@ -84,8 +84,7 @@ public class FileDriver implements DetachedClient, DetachedDriver, if (request != null) if (log.isTraceEnabled()) log.trace("Received detached request #" + request.getUuid() - + " for ref '" + request.getRef() + "', path=" - + request.getPath()); + + " for ref '" + request.getRef()); return request; } @@ -109,8 +108,7 @@ public class FileDriver implements DetachedClient, DetachedDriver, sendFile(requestsDir, request); if (log.isTraceEnabled()) log.trace("Sent detached request #" + request.getUuid() - + " for ref '" + request.getRef() + "', path=" - + request.getPath()); + + " for ref '" + request.getRef()); } protected synchronized void sendFile(File dir, DetachedCommunication detCom) @@ -132,8 +130,8 @@ public class FileDriver implements DetachedClient, DetachedDriver, // Create file path StringBuffer filePath = new StringBuffer(dir.getPath()); - filePath.append(File.separatorChar).append(sdf.format(nowDate)).append( - '-'); + filePath.append(File.separatorChar).append(sdf.format(nowDate)) + .append('-'); filePath.append(mf.format(new Object[] { new Long(counter) })).append( '-'); filePath.append(detCom.getUuid()).append(ext); @@ -225,13 +223,13 @@ public class FileDriver implements DetachedClient, DetachedDriver, FileUtils.moveFileToDirectory(file, processedDir, false); return detCom; } - + public synchronized void stop() { log.debug("Stopping Detached Driver"); active = false; notifyAll(); - } - + } + private synchronized boolean isActive() { return active; }