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/EditImageTechnisch_GUI.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java index 6895f6c1..679b3c62 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java @@ -45,9 +45,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") @@ -65,8 +64,6 @@ public class EditImageTechnisch_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 = "
" + "Bearbeiten Sie hier die technischen Angaben zu Ihrem Image, die Sie beim Erzeugen des Images hinterlegt haben.
" + @@ -83,7 +80,7 @@ public class EditImageTechnisch_GUI extends JFrame { public void windowClosing(WindowEvent arg0) { // Beendet die Anwendung bei Klick auf das X try { - client.setSessionInvalid(SessionData.session.getAuthToken()); + ThriftManager.getSatClient().setSessionInvalid(SessionData.session.getAuthToken()); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -200,7 +197,7 @@ public class EditImageTechnisch_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