From ea9f9848a6e7a68dc90decc2e38bd3e1081ebf8a Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 2 Mar 2015 13:22:44 +0100 Subject: ThriftManager class: use getSatClient() and getMasterClient() to get the singleton instances of the thrift clients to satellite and master servers DO NOT CREATE NEW THRIFT OBJECTS!!! --- .../src/main/java/gui/image/CreateImageTechnisch_GUI.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java index 42e98c4f..ac90c518 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java @@ -46,9 +46,8 @@ import models.person; import org.apache.log4j.Logger; import org.apache.thrift.TException; -import org.openslx.sat.thrift.iface.Server.Client; -import thrift.ThriftConnection; +import thrift.ThriftManager; import util.OpenLinks; @SuppressWarnings("serial") @@ -66,8 +65,6 @@ public class CreateImageTechnisch_GUI extends JFrame { private JCheckBox chckbxIsLicensed; private JCheckBox chckbxIsInternetBlocked; JComboBox comboBox; - ThriftConnection con = new ThriftConnection(); - Client client = models.Client.clientcon.getClient(); Component c = null; private static final String HELP_MESSAGE = "
" + "Geben Sie hier bitte einige technische Daten an, die dann mit dem Image angezeigt werden.
" + @@ -85,7 +82,7 @@ public class CreateImageTechnisch_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { try { - client.setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -202,7 +199,7 @@ public class CreateImageTechnisch_GUI extends JFrame { }); List os = null; try { - os = client.getAllOS(SessionData.session.getAuthToken()); + os = ThriftManager.getSatClient().getAllOS(SessionData.session.getAuthToken()); for(int i=0; i