Download file not working properly actframework#562

greenlaw110 · greenlaw110 · commit 0a8625e1fbfa · 2018-03-16T22:44:53.000+11:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # ActFramework Change Log
 
 **1.8.2**
+* Download file not working properly #562
 * Error with sending large response: UT000043: Data is already being sent. You must wait for the completion callback to be be invoked before calling send() again #560
 * ResourceLoader: support loading json file into Map or other POJO #559
 * Support `@DefaultValue` with `@Configuration` #558
diff --git a/src/main/java/act/inject/util/ResourceLoader.java b/src/main/java/act/inject/util/ResourceLoader.java
@@ -141,9 +141,6 @@ protected static Object _load(String resourcePath, BeanSpec spec, boolean ignore
             return null;
         }
         boolean isJson = resourcePath.endsWith(".json");
-        if (isJson) {
-            return JSON.parseObject(IO.readContentAsString(url), spec.type());
-        }
         Class<?> rawType = spec.rawType();
         if (URL.class == rawType) {
             return url;
@@ -201,6 +198,9 @@ protected static Object _load(String resourcePath, BeanSpec spec, boolean ignore
         } else if (Reader.class == rawType) {
             return new InputStreamReader(IO.is(url));
         }
+        if (isJson) {
+            return JSON.parseObject(IO.readContentAsString(url), spec.type());
+        }
         try {
             return Act.app().resolverManager().resolve(IO.readContentAsString(url), rawType);
         } catch (RuntimeException e) {
diff --git a/src/main/java/act/xio/undertow/UndertowResponse.java b/src/main/java/act/xio/undertow/UndertowResponse.java
@@ -47,6 +47,7 @@
 import java.nio.channels.FileChannel;
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -141,13 +142,20 @@ private void clear() {
     private boolean endAsync;
     private Sender sender;
     private ReentrantLock lock;
+    private boolean isPartialMode;
+    private AtomicBoolean partialSent = new AtomicBoolean();
+    private AtomicBoolean closeExchange = new AtomicBoolean(false);
     private IoCallback ioCallback = new DefaultIoCallback() {
         @Override
         public void onComplete(HttpServerExchange exchange, Sender sender) {
             if (null != lock) {
                 lock.lock();
                 buffer.partSent();
                 lock.unlock();
+            } else if (closeExchange.get()) {
+                exchange.endExchange();
+            } else {
+                partialSent.set(true);
             }
         }
 
@@ -218,8 +226,10 @@ public void writeContentPart(String s) {
     }
 
     public void writeContentPart(ByteBuffer buffer) {
+        isPartialMode = true;
         try {
             if (null != buffer) {
+                partialSent.set(false);
                 sender().send(buffer, ioCallback);
             } else {
                 this.buffer.sendOrBuf(buffer, sender());
@@ -290,8 +300,12 @@ public void commit() {
         } else {
             if (null != buffer) {
                 buffer.sendThroughFinalPart(sender());
-            } else {
-                sender().close(IoCallback.END_EXCHANGE);
+            } else if (isPartialMode) {
+                if (partialSent.get()) {
+                    hse.endExchange();
+                } else {
+                    closeExchange.set(true);
+                }
             }
         }
         markClosed();
