Projects >> railo >>be0cb8647331bd1e98945b180e9b317e93309572

Chunk
Conflicting content 
	}
    

<<<<<<< HEAD
	private synchronized Page compile(ConfigWeb config,Resource classRootDir, Boolean resetCL) throws PageException {
    	try {
            ConfigWebImpl cwi=(ConfigWebImpl) config;
            byte[] barr = cwi.getCompiler().
            	compile(cwi,this,cwi.getTLDs(),cwi.getFLDs(),classRootDir,getJavaName());
           
            PhysicalClassLoader cl;
            if(resetCL==null){
            	cl = (PhysicalClassLoader)mapping.getClassLoaderForPhysical();
                resetCL=Caster.toBoolean(cl!=null && cl.isClassLoaded(getClazz()));
            }
            cl = (PhysicalClassLoader)mapping.getClassLoaderForPhysical(resetCL.booleanValue());
            
            Class clazz=null;
            clazz = cl.loadClass(getClazz(),barr);
            
            /*try {
            	clazz = cl.loadClass(getClazz(),barr);
				
			} 
            catch (Throwable t) {
				t.printStackTrace();
				clazz = cl.loadClass(getClazz(),barr);
			}*/
			return  newInstance(clazz);
=======
	private synchronized PagePlus compile(ConfigWeb config,Resource classRootDir, Boolean resetCL) throws PageException {
		try {
			return _compile(config, classRootDir, resetCL);
>>>>>>> f51f8b5cfbe39484135ff773efe6e441fa78b904
        }
        catch(Throwable t) {
        	throw Caster.toPageException(t);
Solution content 
	}
    

	private synchronized Page compile(ConfigWeb config,Resource classRootDir, Boolean resetCL) throws PageException {
		try {
			return _compile(config, classRootDir, resetCL);
        }
        catch(Throwable t) {
        	throw Caster.toPageException(t);
File
PageSourceImpl.java
Developer's decision
Combination
Kind of conflict
Cast expression
Comment
If statement
Method invocation
Method signature
Return statement
Try statement
Variable
Chunk
Conflicting content 
package railo.runtime.exp;

<<<<<<< HEAD:railo-java/railo-core/src/railo/runtime/exp/CatchBlockImpl.java
import java.io.Serializable;
=======
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
>>>>>>> f51f8b5cfbe39484135ff773efe6e441fa78b904:railo-java/railo-core/src/railo/runtime/exp/CatchBlock.java
import java.util.Set;

import railo.commons.lang.StringUtil;
Solution content 
package railo.runtime.exp;

import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Set;

import railo.commons.lang.StringUtil;
File
CatchBlockImpl.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import railo.runtime.type.util.ArrayUtil;
import railo.runtime.type.util.StructUtil;

<<<<<<< HEAD:railo-java/railo-core/src/railo/runtime/exp/CatchBlockImpl.java
public class CatchBlockImpl extends StructImpl implements CatchBlock,Castable{
=======
public class CatchBlock extends StructImpl implements Castable, Objects{

	private static final long serialVersionUID = -4868635413052937742L;
>>>>>>> f51f8b5cfbe39484135ff773efe6e441fa78b904:railo-java/railo-core/src/railo/runtime/exp/CatchBlock.java

	private static final long serialVersionUID = 2488904376947387039L;
Solution content 
import railo.runtime.type.util.ArrayUtil;
import railo.runtime.type.util.StructUtil;

public class CatchBlockImpl extends StructImpl implements CatchBlock,Castable,Objects{
File
CatchBlockImpl.java
Developer's decision
None
Kind of conflict
Attribute
Class signature
Chunk
Conflicting content 
	public static final Key ADDITIONAL = KeyImpl.intern("additional");
	private static final Object NULL = new Object();
	
<<<<<<< HEAD:railo-java/railo-core/src/railo/runtime/exp/CatchBlockImpl.java
	//private Config config;// MUSTMUST remove this -> serialiable
	private PageExceptionImpl pe;
	private SpecialItem si = new SpecialItem();
	

	public CatchBlockImpl(PageExceptionImpl pe) {
		this.pe=pe;
=======
	private PageExceptionImpl exception;
	

	public CatchBlock(PageExceptionImpl pe) {
		this.exception=pe;

		setEL(MESSAGE, new SpecialItem(pe, MESSAGE));
		setEL(DETAIL, new SpecialItem(pe, DETAIL));
		setEL(ERROR_CODE, new SpecialItem(pe, ERROR_CODE));
		setEL(EXTENDED_INFO, new SpecialItem(pe, EXTENDED_INFO));
		setEL(ADDITIONAL, new SpecialItem(pe, ADDITIONAL));
		setEL(TAG_CONTEXT, new SpecialItem(pe, TAG_CONTEXT));
		setEL(KeyImpl.TYPE, new SpecialItem(pe, KeyImpl.TYPE));
		setEL(STACK_TRACE, new SpecialItem(pe, STACK_TRACE));
>>>>>>> f51f8b5cfbe39484135ff773efe6e441fa78b904:railo-java/railo-core/src/railo/runtime/exp/CatchBlock.java
		
		
		if(pe instanceof NativeException){
Solution content 
	public static final Key ADDITIONAL = KeyImpl.intern("additional");
	private static final Object NULL = new Object();
	
	private PageExceptionImpl exception;
	

	public CatchBlockImpl(PageExceptionImpl pe) {
		this.exception=pe;

		setEL(MESSAGE, new SpecialItem(pe, MESSAGE));
		setEL(DETAIL, new SpecialItem(pe, DETAIL));
		setEL(ERROR_CODE, new SpecialItem(pe, ERROR_CODE));
		setEL(EXTENDED_INFO, new SpecialItem(pe, EXTENDED_INFO));
		setEL(ADDITIONAL, new SpecialItem(pe, ADDITIONAL));
		setEL(TAG_CONTEXT, new SpecialItem(pe, TAG_CONTEXT));
		setEL(KeyImpl.TYPE, new SpecialItem(pe, KeyImpl.TYPE));
		setEL(STACK_TRACE, new SpecialItem(pe, STACK_TRACE));
		
		
		if(pe instanceof NativeException){
File
CatchBlockImpl.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
Method invocation
Method signature
Variable
Chunk
Conflicting content 
	 * @see railo.runtime.type.StructImpl#duplicate(boolean)
	 */
	public Collection duplicate(boolean deepCopy) {
<<<<<<< HEAD:railo-java/railo-core/src/railo/runtime/exp/CatchBlockImpl.java
		initAll();
		CatchBlockImpl trg = new CatchBlockImpl(pe);
		trg.initAll();
		StructImpl.copy(this, trg, deepCopy);
		return trg;
=======
		Struct sct=new StructImpl();
		StructUtil.copy(this, sct, true);
		return sct;
>>>>>>> f51f8b5cfbe39484135ff773efe6e441fa78b904:railo-java/railo-core/src/railo/runtime/exp/CatchBlock.java
	}
	/**
Solution content 
	 * @see railo.runtime.type.StructImpl#duplicate(boolean)
	 */
	public Collection duplicate(boolean deepCopy) {
		Struct sct=new StructImpl();
		StructUtil.copy(this, sct, true);
		return sct;
	}

	/**
File
CatchBlockImpl.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Variable
Chunk
Conflicting content 
		Method getter;
		private boolean doEmptyStringWhenNull;
		
<<<<<<< HEAD:railo-java/railo-core/src/railo/runtime/exp/CatchBlockImpl.java
		if(MESSAGE.equals(key)) 		return setEL(key, StringUtil.emptyIfNull(pe.getMessage()));
		if(DETAIL.equals(key)) 		return setEL(key, StringUtil.emptyIfNull(pe.getDetail()));
		if(ERROR_CODE.equals(key)) 	return setEL(key, StringUtil.emptyIfNull(pe.getErrorCode()));
		if(EXTENDED_INFO.equals(key)) 	return setEL(key, StringUtil.emptyIfNull(pe.getExtendedInfo()));
		if(KeyImpl.TYPE.equals(key)) 			return setEL(key, StringUtil.emptyIfNull(pe.getTypeAsString()));
		if(STACK_TRACE.equals(key)) 	return setEL(key, StringUtil.emptyIfNull(pe.getStackTraceAsString()));
		if(ADDITIONAL.equals(key)) 		return setEL(key, pe.getAdditional());
		if(TAG_CONTEXT.equals(key)) 	return setEL(key, pe.getTagContext(ThreadLocalPageContext.getConfig())); 	
		return null;
=======
		public Pair(Throwable throwable,Key name, Method method,boolean doEmptyStringWhenNull) {
			this.throwable = throwable;
			this.name = name;
			this.getter = method;
			this.doEmptyStringWhenNull = doEmptyStringWhenNull;
		}
		public Pair(Throwable throwable,String name, Method method, boolean doEmptyStringWhenNull) {
			this(throwable, KeyImpl.init(name), method,doEmptyStringWhenNull);
		}
>>>>>>> f51f8b5cfbe39484135ff773efe6e441fa78b904:railo-java/railo-core/src/railo/runtime/exp/CatchBlock.java
	}

	public Object call(PageContext pc, String methodName, Object[] arguments) throws PageException {
Solution content 
		Method getter;
		private boolean doEmptyStringWhenNull;
		
		public Pair(Throwable throwable,Key name, Method method,boolean doEmptyStringWhenNull) {
			this.throwable = throwable;
			this.name = name;
			this.getter = method;
			this.doEmptyStringWhenNull = doEmptyStringWhenNull;
		}
		public Pair(Throwable throwable,String name, Method method, boolean doEmptyStringWhenNull) {
			this(throwable, KeyImpl.init(name), method,doEmptyStringWhenNull);
		}
	}

	public Object call(PageContext pc, String methodName, Object[] arguments) throws PageException {
File
CatchBlockImpl.java
Developer's decision
Version 2
Kind of conflict
If statement
Method declaration
Return statement
Chunk
Conflicting content 
	
	
<<<<<<< HEAD:railo-java/railo-core/src/railo/runtime/exp/CatchBlockImpl.java
	class SpecialItem implements Serializable {

		private static final long serialVersionUID = -8839174054224300183L;
		
	}
=======
>>>>>>> f51f8b5cfbe39484135ff773efe6e441fa78b904:railo-java/railo-core/src/railo/runtime/exp/CatchBlock.java
	
	public Object callWithNamedValues(PageContext pc, String methodName,Struct args) throws PageException {
		throw new ApplicationException("named arguments not supported");
Solution content 
	
	
	
	public Object callWithNamedValues(PageContext pc, String methodName,Struct args) throws PageException {
		throw new ApplicationException("named arguments not supported");
File
CatchBlockImpl.java
Developer's decision
Version 2
Kind of conflict
Class declaration
Chunk
Conflicting content 
	 * @see railo.runtime.exp.IPageException#getCatchBlock()
	 */
	public Struct getCatchBlock() {
<<<<<<< HEAD
		return new CatchBlockImpl(this);
=======
		return new CatchBlock(this);
>>>>>>> f51f8b5cfbe39484135ff773efe6e441fa78b904
	}
	
	/**
Solution content 
	 * @see railo.runtime.exp.IPageException#getCatchBlock()
	 */
	public Struct getCatchBlock() {
		return new CatchBlockImpl(this);
	}
	
	/**
File
PageExceptionImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
	 * @see railo.runtime.exp.IPageException#getCatchBlock(railo.runtime.PageContext)
	 */
	public Struct getCatchBlock(PageContext pc) {
<<<<<<< HEAD
		return new CatchBlockImpl(this);
=======
		return new CatchBlock(this);
>>>>>>> f51f8b5cfbe39484135ff773efe6e441fa78b904
	}
	
	/**
Solution content 
	 * @see railo.runtime.exp.IPageException#getCatchBlock(railo.runtime.PageContext)
	 */
	public Struct getCatchBlock(PageContext pc) {
		return new CatchBlockImpl(this);
	}
	
	/**
File
PageExceptionImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
	 * @see railo.runtime.exp.IPageException#getCatchBlock(railo.runtime.Config)
	 */
	public CatchBlock getCatchBlock(Config config) {
<<<<<<< HEAD
		return new CatchBlockImpl(this);
=======
		return new CatchBlock(this);
>>>>>>> f51f8b5cfbe39484135ff773efe6e441fa78b904
	}
	
	public Array getTagContext(Config config) {
Solution content 
	 * @see railo.runtime.exp.IPageException#getCatchBlock(railo.runtime.Config)
	 */
	public CatchBlock getCatchBlock(Config config) {
		return new CatchBlockImpl(this);
	}
	
	public Array getTagContext(Config config) {
File
PageExceptionImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
import java.io.IOException;
import java.io.InputStream;

<<<<<<< HEAD
import org.apache.sanselan.ImageReadException;
import org.apache.sanselan.Sanselan;

=======
>>>>>>> f51f8b5cfbe39484135ff773efe6e441fa78b904
import railo.commons.io.IOUtil;
import railo.commons.io.res.Resource;
import railo.commons.lang.ExceptionUtil;
Solution content 
import java.io.IOException;
import java.io.InputStream;

import org.apache.sanselan.ImageReadException;
import org.apache.sanselan.Sanselan;

import railo.commons.io.IOUtil;
import railo.commons.io.res.Resource;
import railo.commons.lang.ExceptionUtil;
File
SanselanCoder.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
		int startIndex=query.getCurrentrow(pc.getId()); 
		
        Object startValue=query.get(KeyImpl.init(groupName)); 
<<<<<<< HEAD
        while(ni.hasNext()) { 
            if(!Operator.equals(startValue,query.getAt(KeyImpl.init(groupName),ni.next()),caseSensitive)) { 
=======
        // FUTURE Object startValue=query.get(pc,KeyImpl.init(groupName)); 
        while(ni.hasNext(true)) { 
            if(!Operator.equals(startValue,query.getAt(groupName,ni.next()),caseSensitive)) { 
>>>>>>> f51f8b5cfbe39484135ff773efe6e441fa78b904
                        ni.previous();
                        return _load(startIndex,ni.current());
            }
Solution content 
		int startIndex=query.getCurrentrow(pc.getId()); 
		
        Object startValue=query.get(KeyImpl.init(groupName)); 
        while(ni.hasNext(true)) { 
            if(!Operator.equals(startValue,query.getAt(groupName,ni.next()),caseSensitive)) { 

                        ni.previous();
                        return _load(startIndex,ni.current());
            }
File
NumberIterator.java
Developer's decision
Combination
Kind of conflict
Comment
If statement
While statement