From ab02e581aefff5e075d60731e8c23f1ef24a695d Mon Sep 17 00:00:00 2001
From: Nils Schwabe
Date: Mon, 25 Aug 2014 14:55:48 +0200
Subject: Fix new thriftconnection things

---
 src/main/java/org/openslx/satellitedaemon/db/DbImage.java        | 2 +-
 .../openslx/satellitedaemon/filetransfer/ThriftConnection.java   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/main/java/org/openslx/satellitedaemon/db/DbImage.java b/src/main/java/org/openslx/satellitedaemon/db/DbImage.java
index db90116..77709e7 100644
--- a/src/main/java/org/openslx/satellitedaemon/db/DbImage.java
+++ b/src/main/java/org/openslx/satellitedaemon/db/DbImage.java
@@ -3,7 +3,7 @@ package org.openslx.satellitedaemon.db;
 import java.util.List;
 
 /**
- * Represents an image in the satellites database (mostly from
+ * Represents an image in the satellite's database (mostly from
  * m_VLData_imageInfo)
  */
 public class DbImage
diff --git a/src/main/java/org/openslx/satellitedaemon/filetransfer/ThriftConnection.java b/src/main/java/org/openslx/satellitedaemon/filetransfer/ThriftConnection.java
index b813f15..ed08c85 100644
--- a/src/main/java/org/openslx/satellitedaemon/filetransfer/ThriftConnection.java
+++ b/src/main/java/org/openslx/satellitedaemon/filetransfer/ThriftConnection.java
@@ -15,7 +15,8 @@ import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TNonblockingSocket;
+import org.apache.thrift.transport.TFramedTransport;
+import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
 import org.openslx.imagemaster.crcchecker.CrcFile;
 import org.openslx.imagemaster.thrift.iface.AuthorizationError;
@@ -388,15 +389,15 @@ public class ThriftConnection {
 	private static ImageServer.Client newClient() throws IOException {
 		ImageServer.Client newClient = null;
 		try {
-			TTransport transport;
-			transport = new TNonblockingSocket(
+			TTransport transport = new TFramedTransport( new TSocket(
 					Globals.getMasterserverHost(),
-					Globals.getThriftPort());
+					Globals.getThriftPort()));
 			transport.open();
 			TProtocol protocol = new TBinaryProtocol(transport);
 			newClient = new ImageServer.Client(protocol);
 			log.debug("ThriftConnection: Made a new Client");
 		} catch (TException x) {
+			// TODO: Exception handling
 			log.error("ThriftConnection coudn't create new client.");
 			x.printStackTrace();
 			return null;
-- 
cgit v1.2.3-55-g7522