コミット: 0618cdd02df08006275813246dccc52ccca4eafe - ChlorophyllUploader (hg)

ベータ版移行版。作業部屋IDの綴り修正

コミットメタ情報

• リビジョン: 0618cdd02df08006275813246dccc52ccca4eafe (tree)
• 日時: 2015-07-30 11:56:49
• 作者: MirrgieRiana Kurilab
• コミッター: MirrgieRiana Kurilab

ログメッセージ

OutputFluorine: 特定の条件下でのデッドロックの解消

変更サマリ

• modified: workspace/mirrg.serial.fluorine/src/main/java/mirrg/serial/fluorine/connection/OutputFluorine.java

差分

diff -r ff0d8de23e73 -r 0618cdd02df0 workspace/mirrg.serial.fluorine/src/main/java/mirrg/serial/fluorine/connection/OutputFluorine.java
--- a/workspace/mirrg.serial.fluorine/src/main/java/mirrg/serial/fluorine/connection/OutputFluorine.java	Thu Jul 30 04:26:08 2015 +0900
+++ b/workspace/mirrg.serial.fluorine/src/main/java/mirrg/serial/fluorine/connection/OutputFluorine.java	Thu Jul 30 11:56:49 2015 +0900
@@ -3,7 +3,6 @@
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
 import java.util.LinkedList;
 
 import mirrg.serial.fluorine.encode.EncoderAcsOperator;
@@ -47,13 +46,21 @@
 		try {
 			while (true) {
 
-				synchronized (sendingAcsElements) {
-					Iterator<IAcsElement> iterator = sendingAcsElements.iterator();
-					while (iterator.hasNext()) {
-						IAcsElement acsElement = iterator.next();
+				while (true) {
+
+					IAcsElement acsElement = null;
+					synchronized (sendingAcsElements) {
+						if (!sendingAcsElements.isEmpty()) {
+							acsElement = sendingAcsElements.removeFirst();
+						}
+					}
+
+					if (acsElement != null) {
 						sendImpl(acsElement.get(), listener);
-						iterator.remove();
+					} else {
+						break;
 					}
+
 				}
 
 				Thread.sleep(5);