[MMBASE SCM] r42381 - mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams

[andre]

Author: andre
Date: 2010-06-02 12:41:49 +0200 (Wed, 02 Jun 2010)
New Revision: 42381

Modified:
   
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/CreateCachesFunction.java
Log:
npe seems to originate elsewehere, log a bit igher though

Modified: 
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/CreateCachesFunction.java
===================================================================
--- 
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/CreateCachesFunction.java
        2010-06-02 09:43:29 UTC (rev 42380)
+++ 
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/CreateCachesFunction.java
        2010-06-02 10:41:49 UTC (rev 42381)
@@ -146,7 +146,7 @@
                     if ( list.size() > 0 && ! all ) {
                         jdlist = newJobList(list, jdlist);
                 }
-                    LOG.info("Recreating caches for #" + node.getNumber() + ", 
doing all: " + all);
+                    LOG.info("Re-transcoding caches for #" + node.getNumber() 
+ ", doing all: " + all);
             }
 
                 if (cc != null) {
@@ -198,20 +198,7 @@
             if (config_key != null && !caches.containsValue(config_key)) {
                 // not in caches, must be new config
                 JobDefinition jd = jdlist.get(config_id);
-                Transcoder tr = jd.getTranscoder();
-                
-                if (tr == null) {
-                    try {
-                        tr = AbstractTranscoder.getInstance(config_key);
-                    } catch (ClassNotFoundException cnf) {
-                        LOG.error("Class not found, transcoder in key '" + 
config_key + "' does not exist? - " + cnf);
-                    } catch (InstantiationException ie) {
-                        LOG.error("Exception while instantiating transcoder 
for key '" + config_key + "' - " + ie);
-                    } catch (Exception ex) {
-                        LOG.error("Exception while trying to (re)transcode - " 
+ ex);
-                    }                
-                }
-                
+                Transcoder tr = jd.getTranscoder(); 
                 String label = jd.getLabel(); 
                 MimeType mt = jd.getMimeType();
                 
@@ -231,19 +218,19 @@
                     jd = new JobDefinition(config_id, in, label, tr, mt, 
Stage.TRANSCODER);
                     if (! new_jdlist.containsKey(config_id)) {
                         new_jdlist.put(config_id, jd);
-                        LOG.debug("Added id: " + config_id);
+                        LOG.info("Added for re-transcoding id: " + config_id + 
" [" + jd + "]");
                     }
                     
                 } else {
                     // inId not yet cached
                     if (! new_jdlist.containsKey(inId)) {
                         new_jdlist.put(inId, jdlist.get(inId) );
-                        LOG.debug("Added inId: " + inId);
+                        LOG.info("Added for re-transcoding inId: " + inId);
                     }
                     
                     if (! new_jdlist.containsKey(config_id)) {
                         new_jdlist.put(config_id, jdlist.get(config_id) );
-                        LOG.debug("Added id: " + config_id);
+                        LOG.info("Added for re-transcoding id: " + config_id);
                     }
                 }
             }

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs