From 4c395a150b2995fdda46d33b0ba73190de899cad Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Tue, 3 Oct 2017 09:17:09 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30509 --- client/Maestro/Program.cs | 5 ++++- client/PlanAIRClient/CustomDataGridView.cs | 3 ++- server/-configuration/mediacube-dev.properties | 7 ++----- .../src/user/commons/octopus/OctopusDataMiner.java | 4 ++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/client/Maestro/Program.cs b/client/Maestro/Program.cs index 0d9779c0..c5284276 100644 --- a/client/Maestro/Program.cs +++ b/client/Maestro/Program.cs @@ -104,7 +104,10 @@ namespace Maestro { private void TrayIcon_Click(object sender, EventArgs e) { MethodInfo mi = typeof(NotifyIcon).GetMethod("ShowContextMenu", BindingFlags.Instance | BindingFlags.NonPublic); - mi.Invoke(sender as NotifyIcon, null); + try { + mi.Invoke(sender as NotifyIcon, null); + } + catch (Exception ex) { } } private void ShowAllForms() { diff --git a/client/PlanAIRClient/CustomDataGridView.cs b/client/PlanAIRClient/CustomDataGridView.cs index 271d56b0..267b4399 100644 --- a/client/PlanAIRClient/CustomDataGridView.cs +++ b/client/PlanAIRClient/CustomDataGridView.cs @@ -18,7 +18,8 @@ namespace TrafficClient { } void HorizontalScrollBar_VisibleChanged(object sender, EventArgs e) { - this.VerticalScrollBar.Visible = true; + if (this.VerticalScrollBar != null) + this.VerticalScrollBar.Visible = true; } } } diff --git a/server/-configuration/mediacube-dev.properties b/server/-configuration/mediacube-dev.properties index eff84d65..1e91f8a1 100644 --- a/server/-configuration/mediacube-dev.properties +++ b/server/-configuration/mediacube-dev.properties @@ -4,21 +4,18 @@ jobengine.loglevel=INFO jobengine.jobsteps.root=../user.jobengine.osgi.server/resources/executors jobengine.jobtemplates.root=../user.jobengine.osgi.server/resources/templates jobengine.jobsteps.alternate.root=../user.jobengine.executors/bin/user/jobengine/server/steps -jobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true; +jobengine.db.url=jdbc:db2://10.10.1.28:50000/mc:retrieveMessagesFromServerOnGetMessage=true; jobengine.db.user=db2admin jobengine.db.password=password jobengine.octopus.api.address=http://10.10.1.11/api/v1 jobengine.octopus.api.user=mam jobengine.octopus.api.password=napocska -jobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true; +jobengine.nosql.db.url=jdbc:db2://10.10.1.28:50000/mc:retrieveMessagesFromServerOnGetMessage=true; jobengine.nosql.db.user=db2admin jobengine.nosql.db.password=password jobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB; jobengine.nexio.db.user=sa jobengine.nexio.db.password=resolve -jobengine.rcc.host=localhost -jobengine.rcc.defaultlowresprofile=MediaCube-H264 -jobengine.transcoder.source=c\:_Moviehires #System jetty.home=../user.jobengine.osgi.rest/ jetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,etc/user-jetty-http.xml,etc/user-jetty-https.xml diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java index 9234a641..096b470f 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java @@ -92,6 +92,8 @@ public class OctopusDataMiner implements Runnable { } public void addProgressListener(IProgressEventListener listener) { + if (progressListenerList == null) + progressListenerList = new EventListenerList(); progressListenerList.add(IProgressEventListener.class, listener); } @@ -180,6 +182,8 @@ public class OctopusDataMiner implements Runnable { private void fireProgressEvent(ProgressEvent evt) { logger.debug("Progress changed to " + evt.getProgress() + "%"); + if (progressListenerList == null) + return; Object[] listeners = progressListenerList.getListenerList(); for (int i = 0; i < listeners.length; i += 2) { if (listeners[i] == IProgressEventListener.class) -- 2.54.0