git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/Maestro/Program.cs b/client/Maestro/Program.cs
index 0d9779c0fd3d1b794d2df441a98e8cd24c98e584..c528427619d60431d0b511728bee92694081a122 100644 (file)
--- a/client/Maestro/Program.cs
+++ b/client/Maestro/Program.cs
@@ -104,7 +104,10 @@ namespace Maestro {
 \r
         private void TrayIcon_Click(object sender, EventArgs e) {\r
             MethodInfo mi = typeof(NotifyIcon).GetMethod("ShowContextMenu", BindingFlags.Instance | BindingFlags.NonPublic);\r
-            mi.Invoke(sender as NotifyIcon, null);\r
+            try {\r
+                mi.Invoke(sender as NotifyIcon, null);\r
+            }\r
+            catch (Exception ex) { }\r
         }\r
 \r
         private void ShowAllForms() {\r

diff --git a/client/PlanAIRClient/CustomDataGridView.cs b/client/PlanAIRClient/CustomDataGridView.cs
index 271d56b05bfb31d7f24b73d678bdb01050bbf670..267b439956daf6c6ceaa423cab30f1a451a3d437 100644 (file)
--- a/client/PlanAIRClient/CustomDataGridView.cs
+++ b/client/PlanAIRClient/CustomDataGridView.cs
@@ -18,7 +18,8 @@ namespace TrafficClient {
         }\r
 \r
         void HorizontalScrollBar_VisibleChanged(object sender, EventArgs e) {\r
-            this.VerticalScrollBar.Visible = true;\r
+            if (this.VerticalScrollBar != null)\r
+                this.VerticalScrollBar.Visible = true;\r
         }\r
     }\r
 }\r

diff --git a/server/-configuration/mediacube-dev.properties b/server/-configuration/mediacube-dev.properties
index eff84d65f4eb035812dc3c44b643ccec6a1a4be9..1e91f8a1d97d716b2e254dae68877b8d8b5d3f63 100644 (file)
--- 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\r
 jobengine.jobtemplates.root=../user.jobengine.osgi.server/resources/templates\r
 jobengine.jobsteps.alternate.root=../user.jobengine.executors/bin/user/jobengine/server/steps\r
-jobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;\r
+jobengine.db.url=jdbc:db2://10.10.1.28:50000/mc:retrieveMessagesFromServerOnGetMessage=true;\r
 jobengine.db.user=db2admin\r
 jobengine.db.password=password\r
 jobengine.octopus.api.address=http://10.10.1.11/api/v1\r
 jobengine.octopus.api.user=mam\r
 jobengine.octopus.api.password=napocska\r
-jobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true;\r
+jobengine.nosql.db.url=jdbc:db2://10.10.1.28:50000/mc:retrieveMessagesFromServerOnGetMessage=true;\r
 jobengine.nosql.db.user=db2admin\r
 jobengine.nosql.db.password=password\r
 jobengine.nexio.db.url=jdbc:sqlserver://10.10.1.59:1433;databaseName=NXDB;\r
 jobengine.nexio.db.user=sa\r
 jobengine.nexio.db.password=resolve\r
-jobengine.rcc.host=localhost\r
-jobengine.rcc.defaultlowresprofile=MediaCube-H264\r
-jobengine.transcoder.source=c\:_Moviehires\r
 #System\r
 jetty.home=../user.jobengine.osgi.rest/\r
 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\r

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 9234a64109ed7ce41bbf0dae886c1e32edc84cca..096b470f238f7bf41826e9248308e350423b11f9 100644 (file)
--- 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 {
        }\r
 \r
        public void addProgressListener(IProgressEventListener listener) {\r
+               if (progressListenerList == null)\r
+                       progressListenerList = new EventListenerList();\r
                progressListenerList.add(IProgressEventListener.class, listener);\r
        }\r
 \r
@@ -180,6 +182,8 @@ public class OctopusDataMiner implements Runnable {
 \r
        private void fireProgressEvent(ProgressEvent evt) {\r
                logger.debug("Progress changed to " + evt.getProgress() + "%");\r
+               if (progressListenerList == null)\r
+                       return;\r
                Object[] listeners = progressListenerList.getListenerList();\r
                for (int i = 0; i < listeners.length; i += 2) {\r
                        if (listeners[i] == IProgressEventListener.class)\r