Projects >> railo >>ef869c1bd2ebaae3dabe7aa479936f89d00a9a06

Chunk
Conflicting content 
            	
            	key=KeyImpl.toKey(it.next(),null);
                //print.out("key:"+key);
<<<<<<< HEAD
                pc=(PageContext) runningPcs.get(key,null);
                if(pc==null || ((PageContextImpl)pc).isGatewayContext()) continue;
=======
                pc=(PageContextImpl) runningPcs.get(key,null);
                if(pc==null || pc.isGatewayContext()) continue;
                thread=pc.getThread();
                if(thread==Thread.currentThread()) continue;
>>>>>>> 872fad8247e6b90ef0844fea7e0c634f92de7717
                
                thread=pc.getThread();
                if(thread==Thread.currentThread()) continue;
Solution content 
            	
            	key=KeyImpl.toKey(it.next(),null);
                //print.out("key:"+key);
                pc=(PageContextImpl) runningPcs.get(key,null);
                if(pc==null || pc.isGatewayContext()) continue;
                thread=pc.getThread();
                if(thread==Thread.currentThread()) continue;

                
                thread=pc.getThread();
                if(thread==Thread.currentThread()) continue;
File
CFMLFactoryImpl.java
Developer's decision
Version 2
Kind of conflict
Cast expression
If statement
Method invocation
Variable
Chunk
Conflicting content 
                
                data.setEL("startTime", new DateTimeImpl(pc.getStartTime(),false));
                data.setEL("endTime", new DateTimeImpl(pc.getStartTime()+pc.getRequestTimeout(),false));
<<<<<<< HEAD
                data.setEL("timeout",new Double(pc.getRequestTimeout()));
=======
                data.setEL("timeout", Caster.toDouble(pc.getRequestTimeout()));
>>>>>>> 872fad8247e6b90ef0844fea7e0c634f92de7717
                
                // thread
                sctThread.setEL("name",thread.getName());
Solution content 
                
                data.setEL("startTime", new DateTimeImpl(pc.getStartTime(),false));
                data.setEL("endTime", new DateTimeImpl(pc.getStartTime()+pc.getRequestTimeout(),false));
                data.setEL("timeout",new Double(pc.getRequestTimeout()));

                
                // thread
                sctThread.setEL("name",thread.getName());
File
CFMLFactoryImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
                data.setEL("TagContext",PageExceptionImpl.getTagContext(pc.getConfig(),thread.getStackTrace() ));

                data.setEL("urlToken", pc.getURLToken());
<<<<<<< HEAD
                data.setEL("debugger", pc.getDebugger().getDebuggingData(pc));
=======
                data.setEL("debugger", pc.getDebugger().getDebuggingData());
>>>>>>> 872fad8247e6b90ef0844fea7e0c634f92de7717
                try {
					data.setEL("id", Hash.call(pc, pc.getId()+":"+pc.getStartTime()));
				} catch (PageException e1) {}
Solution content 
                data.setEL("TagContext",PageExceptionImpl.getTagContext(pc.getConfig(),thread.getStackTrace() ));

                data.setEL("urlToken", pc.getURLToken());
                data.setEL("debugger", pc.getDebugger().getDebuggingData(pc));

                try {
					data.setEL("id", Hash.call(pc, pc.getId()+":"+pc.getStartTime()));
				} catch (PageException e1) {}
File
CFMLFactoryImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
            return info;
        }
	}
<<<<<<< HEAD
	

	public void stopThread(String threadId, String stopType) {
		synchronized (pcs) {
=======

	
	

	public void stopThread(String threadId, String stopType) {
		synchronized (runningPcs) {
>>>>>>> 872fad8247e6b90ef0844fea7e0c634f92de7717
            //int len=runningPcs.size();
			Iterator it = runningPcs.keyIterator();
            PageContext pc;
Solution content 
            return info;
        }
	}

	public void stopThread(String threadId, String stopType) {
		synchronized (runningPcs) {
            //int len=runningPcs.size();
			Iterator it = runningPcs.keyIterator();
            PageContext pc;
File
CFMLFactoryImpl.java
Developer's decision
Version 2
Kind of conflict
Method signature
Synchronized statement
Chunk
Conflicting content 
	        	}
	    		listener.onError(this,pe);	
	    	}
<<<<<<< HEAD
=======
	    	else log(false);
>>>>>>> 872fad8247e6b90ef0844fea7e0c634f92de7717
	    	if(throwExcpetion) throw pe;
	    }
	    finally {
Solution content 
	        	}
	    		listener.onError(this,pe);	
	    	}
	    	else log(false);

	    	if(throwExcpetion) throw pe;
	    }
	    finally {
File
PageContextImpl.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
            base=null;
	    }
	}
<<<<<<< HEAD
=======
	
	private void log(boolean error) {
		ConfigServerImpl cs = config.getConfigServerImpl();
		if(!isGatewayContext() && cs.isMonitoringEnabled()) {
            RequestMonitor[] monitors = cs.getRequestMonitors();
            if(monitors!=null)for(int i=0;i>>>>>> 872fad8247e6b90ef0844fea7e0c634f92de7717

	private PageSource getPageSource(Mapping[] mappings, String realPath) {
		PageSource ps;
Solution content 
            base=null;
	    }
	}

	private void log(boolean error) {
		ConfigServerImpl cs = config.getConfigServerImpl();
		if(!isGatewayContext() && cs.isMonitoringEnabled()) {
            RequestMonitor[] monitors = cs.getRequestMonitors();
            if(monitors!=null)for(int i=0;i
File
PageContextImpl.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
import railo.loader.engine.CFMLEngine;
import railo.runtime.CFMLFactoryImpl;
import railo.runtime.engine.CFMLEngineImpl;
<<<<<<< HEAD
import railo.runtime.engine.ThreadQueueImpl;
=======
import railo.runtime.exp.ApplicationException;
import railo.runtime.monitor.IntervallMonitor;
import railo.runtime.monitor.RequestMonitor;
>>>>>>> 872fad8247e6b90ef0844fea7e0c634f92de7717
import railo.runtime.security.SecurityManager;
import railo.runtime.security.SecurityManagerImpl;
Solution content 
import railo.loader.engine.CFMLEngine;
import railo.runtime.CFMLFactoryImpl;
import railo.runtime.engine.CFMLEngineImpl;
import railo.runtime.engine.ThreadQueueImpl;
import railo.runtime.exp.ApplicationException;
import railo.runtime.monitor.IntervallMonitor;
import railo.runtime.monitor.RequestMonitor;
import railo.runtime.security.SecurityManager;
import railo.runtime.security.SecurityManagerImpl;
File
ConfigServerImpl.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
		return labels;
	}

<<<<<<< HEAD
	
	private ThreadQueueImpl threadQueue;
	protected void setThreadQueue(ThreadQueueImpl threadQueue) {
		this.threadQueue=threadQueue;
	}
	public ThreadQueueImpl getThreadQueue() {
		return threadQueue;
=======
	public RequestMonitor[] getRequestMonitors() {
		return requestMonitors;
	}
	
	public RequestMonitor getRequestMonitor(String name) throws ApplicationException {
		for(int i=0;i>>>>>> 872fad8247e6b90ef0844fea7e0c634f92de7717
	}
Solution content 
		return labels;
	}

	
	private ThreadQueueImpl threadQueue;
	protected void setThreadQueue(ThreadQueueImpl threadQueue) {
		this.threadQueue=threadQueue;
	}
	public ThreadQueueImpl getThreadQueue() {
		return threadQueue;
	}
	
	public RequestMonitor[] getRequestMonitors() {
		return requestMonitors;
	}
	
	public RequestMonitor getRequestMonitor(String name) throws ApplicationException {
		for(int i=0;i
File
ConfigServerImpl.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method declaration
Method signature
Return statement
Chunk
Conflicting content 
    	loadDumpWriter(cs, config, doc);
    	loadGatewayEL(configServer,config,doc);
    	loadExeLog(configServer,config,doc);
<<<<<<< HEAD
    	loadThreadQueue(configServer, config, doc);
=======
    	loadMonitors(configServer,config,doc);
>>>>>>> 872fad8247e6b90ef0844fea7e0c634f92de7717
    	config.setLoadTime(System.currentTimeMillis());
    	
    	// this call is needed to make sure the railo StaticLoggerBinder is loaded
Solution content 
    	loadDumpWriter(cs, config, doc);
    	loadGatewayEL(configServer,config,doc);
    	loadExeLog(configServer,config,doc);
    	loadThreadQueue(configServer, config, doc);
    	loadMonitors(configServer,config,doc);
    	config.setLoadTime(System.currentTimeMillis());
    	
    	// this call is needed to make sure the railo StaticLoggerBinder is loaded
File
ConfigWebFactory.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Chunk
Conflicting content 
		if("heap".equalsIgnoreCase(type))
			return SystemUtil.getMemoryUsage(SystemUtil.MEMORY_TYPE_HEAP);
		if("non_heap".equalsIgnoreCase(type) || "nonheap".equalsIgnoreCase(type) || "non-heap".equalsIgnoreCase(type) ||
<<<<<<< HEAD
				"none_heap".equalsIgnoreCase(type) || "noneheap".equalsIgnoreCase(type) || "none-heap".equalsIgnoreCase(type))
=======
				"none_heap".equalsIgnoreCase(type) || "noneheap".equalsIgnoreCase(type) || "none-heap".equalsIgnoreCase(type)) 
>>>>>>> 872fad8247e6b90ef0844fea7e0c634f92de7717
				return SystemUtil.getMemoryUsage(SystemUtil.MEMORY_TYPE_NON_HEAP);
        
		throw new FunctionException(pc, "GetMemoryUsage", 1, "type", "invalid value ["+type+"], valid values are [heap,non_heap]");
Solution content 
		if("heap".equalsIgnoreCase(type))
			return SystemUtil.getMemoryUsage(SystemUtil.MEMORY_TYPE_HEAP);
		if("non_heap".equalsIgnoreCase(type) || "nonheap".equalsIgnoreCase(type) || "non-heap".equalsIgnoreCase(type) ||
				"none_heap".equalsIgnoreCase(type) || "noneheap".equalsIgnoreCase(type) || "none-heap".equalsIgnoreCase(type))
				return SystemUtil.getMemoryUsage(SystemUtil.MEMORY_TYPE_NON_HEAP);
        
		throw new FunctionException(pc, "GetMemoryUsage", 1, "type", "invalid value ["+type+"], valid values are [heap,non_heap]");
File
GetMemoryUsage.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
	private static final Collection.Key ROOT = KeyImpl.intern("root");
	private static final Collection.Key CONFIG = KeyImpl.intern("config");
	private static final Collection.Key FILE_ACCESS = KeyImpl.intern("file_access");
<<<<<<< HEAD
	private static final Collection.Key IP_RANGE = KeyImpl.intern("ipRange");
	private static final Collection.Key CUSTOM = KeyImpl.intern("custom");
	private static final Collection.Key READONLY = KeyImpl.intern("readOnly");
=======
	private static final Collection.Key LOG_ENABLED = KeyImpl.intern("logEnabled");
	private static final Collection.Key CLASS = KeyImpl.intern("class");
>>>>>>> 872fad8247e6b90ef0844fea7e0c634f92de7717
Solution content 
	private static final Collection.Key ROOT = KeyImpl.intern("root");
	private static final Collection.Key CONFIG = KeyImpl.intern("config");
	private static final Collection.Key FILE_ACCESS = KeyImpl.intern("file_access");
	private static final Collection.Key IP_RANGE = KeyImpl.intern("ipRange");
	private static final Collection.Key CUSTOM = KeyImpl.intern("custom");
	private static final Collection.Key READONLY = KeyImpl.intern("readOnly");
	private static final Collection.Key LOG_ENABLED = KeyImpl.intern("logEnabled");
	private static final Collection.Key CLASS = KeyImpl.intern("class");
File
Admin.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
import java.io.IOException;

<<<<<<< HEAD
import railo.commons.io.IOUtil;
import railo.commons.io.res.Resource;
=======
import railo.aprint;
import railo.commons.io.IOUtil;
import railo.commons.io.res.Resource;
import railo.commons.io.res.ResourcesImpl;
>>>>>>> 872fad8247e6b90ef0844fea7e0c634f92de7717

public class StringExternalizerWriter {
Solution content 
import java.io.IOException;

import railo.aprint;
import railo.commons.io.IOUtil;
import railo.commons.io.res.Resource;
import railo.commons.io.res.ResourcesImpl;

public class StringExternalizerWriter {
File
StringExternalizerWriter.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
	 * @throws TemplateException
	 */
	private void writeOutTypeQuery(BytecodeContext bc) throws BytecodeException {
<<<<<<< HEAD
		ForContitionIntVisitor forContitionVisitor = new ForContitionIntVisitor();// TODO replace with ForIntVisitor 
		loopVisitor=forContitionVisitor;
		final GeneratorAdapter adapter = bc.getAdapter();
=======
		ForConditionIntVisitor forConditionVisitor = new ForConditionIntVisitor();// TODO replace with ForIntVisitor 
		loopVisitor=forConditionVisitor;
		GeneratorAdapter adapter = bc.getAdapter();
>>>>>>> 872fad8247e6b90ef0844fea7e0c634f92de7717
		// railo.runtime.type.Query query=pc.getQuery(@query);
		final int query=adapter.newLocal(Types.QUERY);
		adapter.loadArg(0);
Solution content 
	 * @throws TemplateException
	 */
	private void writeOutTypeQuery(BytecodeContext bc) throws BytecodeException {
		ForConditionIntVisitor forConditionVisitor = new ForConditionIntVisitor();// TODO replace with ForIntVisitor 
		loopVisitor=forConditionVisitor;
		final GeneratorAdapter adapter = bc.getAdapter();

		// railo.runtime.type.Query query=pc.getQuery(@query);
		final int query=adapter.newLocal(Types.QUERY);
		adapter.loadArg(0);
File
TagLoop.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
Method invocation
Variable