Author: ptw
Date: 2007-09-25 09:36:15 -0700 (Tue, 25 Sep 2007)
New Revision: 6587

Modified:
   
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/CommonGenerator.java
Log:
Change 20070925-ptw-7 by [EMAIL PROTECTED] on 2007-09-25 09:38:45 EDT
    in /Users/ptw/OpenLaszlo/ringding
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Fix merge error in r6548

Bugs Fixed:
LPP-4786 'Script compiler needs refactoring before SWF9 work can begin'

Technical Reviewer: [EMAIL PROTECTED] (Message-Id: <[EMAIL PROTECTED]>)
QA Reviewer: jcrowley (pending)

Details:
    Assertion left in common path that is supposed to only be in subclass.

Tests:
    ant clean build will now build without assertion



Modified: 
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/CommonGenerator.java
===================================================================
--- 
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/CommonGenerator.java  
    2007-09-25 16:20:32 UTC (rev 6586)
+++ 
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/sc/CommonGenerator.java  
    2007-09-25 16:36:15 UTC (rev 6587)
@@ -103,8 +103,6 @@
     this.options = options;
     this.runtime = ((String)options.get(Compiler.RUNTIME)).intern();
     setRuntime(this.runtime);
-    assert org.openlaszlo.compiler.Compiler.SWF_RUNTIMES.contains(runtime) : 
"unknown runtime " + runtime;
-    Instructions.setRuntime(runtime);
   }
 
   public InstructionCollector getCollector() {


_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins

Reply via email to