Projects >> railo >>48200a95b22c5cfa0f9a198a2b3df83be5f42953

Chunk
Conflicting content 
			}
			else if(type==MemoryType.NON_HEAP) {
				// clear none-heap
<<<<<<< HEAD
				((Config) handback).checkPermGenSpace(false);
=======
				ConfigServerImpl.checkPermGenSpace((Config) handback,false);
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
			}
			
			/*CompositeDataSupport usage=(CompositeDataSupport) data.get("usage");
Solution content 
			}
			else if(type==MemoryType.NON_HEAP) {
				// clear none-heap
				((Config) handback).checkPermGenSpace(false);
			}
			
			/*CompositeDataSupport usage=(CompositeDataSupport) data.get("usage");
File
MemoryNotificationListener.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
import railo.loader.engine.CFMLEngineFactory;
import railo.runtime.PageContext;
import railo.runtime.config.Config;
<<<<<<< HEAD
=======
import railo.runtime.config.ConfigImpl;
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
import railo.runtime.config.ConfigWeb;
import railo.runtime.config.ConfigWebImpl;
Solution content 
import railo.loader.engine.CFMLEngineFactory;
import railo.runtime.PageContext;
import railo.runtime.config.Config;
import railo.runtime.config.ConfigWeb;
import railo.runtime.config.ConfigWebImpl;
File
JarLoader.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    }

	private static URL toURL(Config config, String jarName) throws MalformedURLException {
<<<<<<< HEAD
		URL hostUrl=config.getUpdateLocation();
=======
		URL hostUrl=((ConfigImpl)config).getUpdateLocation();
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
        if(hostUrl==null)hostUrl=new URL("http://www.getrailo.org");
        return new URL(hostUrl,"/railo/remote/jars/"+jarName);
	}
Solution content 
    }

	private static URL toURL(Config config, String jarName) throws MalformedURLException {
		URL hostUrl=config.getUpdateLocation();
        if(hostUrl==null)hostUrl=new URL("http://www.getrailo.org");
        return new URL(hostUrl,"/railo/remote/jars/"+jarName);
	}
File
JarLoader.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    	if(pclCollection==null){
    		pclCollection=new PCLCollection(this,getClassRootDirectory(),getClass().getClassLoader(),classLoaderMaxElements);
		}
<<<<<<< HEAD
    	getConfig().checkPermGenSpace(true);
=======
    	ConfigServerImpl.checkPermGenSpace(getConfig(),true);
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
    	return pclCollection;
    }
	public synchronized PCLCollection getPCLCollection() {
Solution content 
    	if(pclCollection==null){
    		pclCollection=new PCLCollection(this,getClassRootDirectory(),getClass().getClassLoader(),classLoaderMaxElements);
		}
    	getConfig().checkPermGenSpace(true);
    	return pclCollection;
    }
	public synchronized PCLCollection getPCLCollection() {
File
MappingImpl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
=======
	
	public abstract boolean getLoginCaptcha();

<<<<<<< HEAD
	private boolean dotNotationUpperCase=true;
	protected void setDotNotationUpperCase(boolean dotNotationUpperCase) {
		this.dotNotationUpperCase=dotNotationUpperCase;
	}

	public boolean getDotNotationUpperCase() {
		return dotNotationUpperCase;
	}

	public abstract Cluster createClusterScope() throws PageException;
	public abstract Resource getConfigServerDir();

	public abstract boolean isMonitoringEnabled();

	public abstract RequestMonitor[] getRequestMonitors() ;
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807

	
}
Solution content 
	
	public abstract boolean getLoginCaptcha();

	private boolean dotNotationUpperCase=true;
	protected void setDotNotationUpperCase(boolean dotNotationUpperCase) {
		this.dotNotationUpperCase=dotNotationUpperCase;
	}

	public boolean getDotNotationUpperCase() {
		return dotNotationUpperCase;
	}

	public abstract Cluster createClusterScope() throws PageException;

	
}
File
ConfigImpl.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method declaration
Method interface
Chunk
Conflicting content 
import railo.commons.collections.HashTable;
import railo.commons.io.SystemUtil;
import railo.commons.io.res.Resource;
<<<<<<< HEAD
import railo.commons.io.res.ResourcesImpl;
=======
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
import railo.commons.lang.ClassUtil;
import railo.commons.lang.PCLCollection;
import railo.commons.lang.StringUtil;
Solution content 
import railo.commons.collections.HashTable;
import railo.commons.io.SystemUtil;
import railo.commons.io.res.Resource;
import railo.commons.io.res.ResourcesImpl;
import railo.commons.lang.ClassUtil;
import railo.commons.lang.PCLCollection;
import railo.commons.lang.StringUtil;
File
ConfigServerImpl.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import railo.commons.lang.PCLCollection;
import railo.commons.lang.StringUtil;
import railo.commons.lang.SystemOut;
<<<<<<< HEAD
import railo.loader.TP;
=======
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
import railo.loader.engine.CFMLEngine;
import railo.loader.engine.CFMLEngineFactory;
import railo.loader.util.ExtensionFilter;
Solution content 
import railo.commons.lang.PCLCollection;
import railo.commons.lang.StringUtil;
import railo.commons.lang.SystemOut;
import railo.loader.TP;
import railo.loader.engine.CFMLEngine;
import railo.loader.engine.CFMLEngineFactory;
import railo.loader.util.ExtensionFilter;
File
ConfigServerImpl.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	}
		return 0;
	}
	
<<<<<<< HEAD
    public void reset() {
    	super.reset();
    	getThreadQueue().clear();
    }
    
    @Override
	public Resource getSecurityDirectory(){
    	Resource cacerts=null;
    	// javax.net.ssl.trustStore
    	String trustStore = SystemUtil.getPropertyEL("javax.net.ssl.trustStore");
    	if(trustStore!=null){
    		cacerts = ResourcesImpl.getFileResourceProvider().getResource(trustStore);
    	}
    	
    	// security/cacerts
    	if(cacerts==null || !cacerts.exists()) {
    		cacerts = getConfigDir().getRealResource("security/cacerts");
    		if(!cacerts.exists())cacerts.mkdirs();
    	}
    	return cacerts;
	}
    
    @Override
	public void checkPermGenSpace(boolean check) {
    	//print.e(Runtime.getRuntime().freeMemory());
		// Runtime.getRuntime().freeMemory()<200000 || 
    	// long pgs=SystemUtil.getFreePermGenSpaceSize();
    	int promille=SystemUtil.getFreePermGenSpacePromille();
    	
    	// Pen Gen Space info not available 
    	if(promille==-1) {//if(pgs==-1) {
    		if(countLoadedPages()>500)
    			shrink();
    	}
    	else if(!check || promille<50){//else if(!check || pgs<1024*1024){
			SystemOut.printDate(getErrWriter(),"+Free Perm Gen Space is less than 1mb (free:"+((SystemUtil.getFreePermGenSpaceSize())/1024)+"kb), shrink all template classloaders");
			// first just call GC and check if it help
			System.gc();
			//if(SystemUtil.getFreePermGenSpaceSize()>1024*1024) 
			if(SystemUtil.getFreePermGenSpacePromille()>50) 
				return;
			
			shrink();
		}
	}
    
    private void shrink() {
    	ConfigWeb[] webs = getConfigWebs();
		int count=0;
		for(int i=0;i>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807

	private static int shrink(Mapping[] mappings, boolean force) {
		int count=0;
Solution content 
    public void reset() {
    	super.reset();
    	getThreadQueue().clear();
    }
    
    @Override
	public Resource getSecurityDirectory(){
    	Resource cacerts=null;
    	// javax.net.ssl.trustStore
    	String trustStore = SystemUtil.getPropertyEL("javax.net.ssl.trustStore");
    	if(trustStore!=null){
    		cacerts = ResourcesImpl.getFileResourceProvider().getResource(trustStore);
    	}
    	
    	// security/cacerts
    	if(cacerts==null || !cacerts.exists()) {
    		cacerts = getConfigDir().getRealResource("security/cacerts");
    		if(!cacerts.exists())cacerts.mkdirs();
    	}
    	return cacerts;
	}
    
    @Override
	public void checkPermGenSpace(boolean check) {
    	//print.e(Runtime.getRuntime().freeMemory());
		// Runtime.getRuntime().freeMemory()<200000 || 
    	// long pgs=SystemUtil.getFreePermGenSpaceSize();
    	int promille=SystemUtil.getFreePermGenSpacePromille();
    	
    	// Pen Gen Space info not available 
    	if(promille==-1) {//if(pgs==-1) {
    		if(countLoadedPages()>500)
    			shrink();
    	}
    	else if(!check || promille<50){//else if(!check || pgs<1024*1024){
			SystemOut.printDate(getErrWriter(),"+Free Perm Gen Space is less than 1mb (free:"+((SystemUtil.getFreePermGenSpaceSize())/1024)+"kb), shrink all template classloaders");
			// first just call GC and check if it help
			System.gc();
			//if(SystemUtil.getFreePermGenSpaceSize()>1024*1024) 
			if(SystemUtil.getFreePermGenSpacePromille()>50) 
				return;
			
			shrink();
		}
	}
    
    private void shrink() {
    	ConfigWeb[] webs = getConfigWebs();
		int count=0;
		for(int i=0;i
File
ConfigServerImpl.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
import railo.runtime.gateway.GatewayEntry;
import railo.runtime.lock.LockManager;
import railo.runtime.lock.LockManagerImpl;
<<<<<<< HEAD
import railo.runtime.monitor.IntervallMonitor;
=======
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
import railo.runtime.monitor.RequestMonitor;
import railo.runtime.security.SecurityManager;
import railo.runtime.security.SecurityManagerImpl;
Solution content 
import railo.runtime.gateway.GatewayEntry;
import railo.runtime.lock.LockManager;
import railo.runtime.lock.LockManagerImpl;
import railo.runtime.monitor.IntervallMonitor;
import railo.runtime.monitor.RequestMonitor;
import railo.runtime.security.SecurityManager;
import railo.runtime.security.SecurityManagerImpl;
File
ConfigWebImpl.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    }
    

<<<<<<< HEAD
    public ConfigServer getConfigServerX() {
    	//throw new PageRuntimeException(new SecurityException("access on server config without password denied"));
        return configServer;
=======
    public ConfigServer getConfigServer() {
    	throw new PageRuntimeException(new SecurityException("access on server config without password denied"));
        //return configServer;
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
    }
    
    /**
Solution content 
    }
    

    public ConfigServer getConfigServerX() {
    	//throw new PageRuntimeException(new SecurityException("access on server config without password denied"));
        return configServer;
    }
    
    /**
File
ConfigWebImpl.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method signature
Return statement
Throw statement
Chunk
Conflicting content 
		}
		}
		

<<<<<<< HEAD
		
		public RequestMonitor[] getRequestMonitors(){
			return configServer.getRequestMonitors();
		}
		
		public RequestMonitor getRequestMonitor(String name) throws PageException{
			return configServer.getRequestMonitor(name);
		
		public IntervallMonitor[] getIntervallMonitors(){
			return configServer.getIntervallMonitors();
		}

		public IntervallMonitor getIntervallMonitor(String name) throws PageException{
			return configServer.getIntervallMonitor(name);
		}
		
		@Override
		public void checkPermGenSpace(boolean check) {
			configServer.checkPermGenSpace(check);
		}

		@Override
		public Cluster createClusterScope() throws PageException {
			return configServer.createClusterScope();
		}

		@Override
		public boolean hasServerPassword() {
			return configServer.hasPassword();
		}
		
		public void setPassword(boolean server, String passwordOld, String passwordNew) 
			throws PageException, SAXException, ClassException, IOException, TagLibException, FunctionLibException {
	    	ConfigImpl config=server?configServer:this;
	    	    
		    if(!config.hasPassword()) { 
		        config.setPassword(passwordNew);
		        
		        ConfigWebAdmin admin = ConfigWebAdmin.newInstance(config,passwordNew);
		        admin.setPassword(passwordNew);
		        admin.store();
		    }
		    else {
		    	ConfigWebUtil.checkGeneralWriteAccess(config,passwordOld);
		        ConfigWebAdmin admin = ConfigWebAdmin.newInstance(config,passwordOld);
		        admin.setPassword(passwordNew);
		        admin.store();
		    }
		}

		@Override
=======
		public boolean allowRequestTimeout() {
			return configServer.getCFMLEngineImpl().allowRequestTimeout();
		}

>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
		public Resource getConfigServerDir() {
			return configServer.getConfigDir();
		}
Solution content 
		}
		}
		

		
		public RequestMonitor[] getRequestMonitors(){
			return configServer.getRequestMonitors();
		}
		
		public RequestMonitor getRequestMonitor(String name) throws PageException{
			return configServer.getRequestMonitor(name);
		}
		
		public IntervallMonitor[] getIntervallMonitors(){
			return configServer.getIntervallMonitors();
		}

		public IntervallMonitor getIntervallMonitor(String name) throws PageException{
			return configServer.getIntervallMonitor(name);
		
		@Override
		public void checkPermGenSpace(boolean check) {
			configServer.checkPermGenSpace(check);
		}

		@Override
		public Cluster createClusterScope() throws PageException {
			return configServer.createClusterScope();
		}

		@Override
		public boolean hasServerPassword() {
			return configServer.hasPassword();
		}
		
		public void setPassword(boolean server, String passwordOld, String passwordNew) 
			throws PageException, SAXException, ClassException, IOException, TagLibException, FunctionLibException {
	    	ConfigImpl config=server?configServer:this;
	    	    
		    if(!config.hasPassword()) { 
		        config.setPassword(passwordNew);
		        
		        ConfigWebAdmin admin = ConfigWebAdmin.newInstance(config,passwordNew);
		        admin.setPassword(passwordNew);
		        admin.store();
		    }
		    else {
		    	ConfigWebUtil.checkGeneralWriteAccess(config,passwordOld);
		        ConfigWebAdmin admin = ConfigWebAdmin.newInstance(config,passwordOld);
		        admin.setPassword(passwordNew);
		        admin.store();
		    }
		}

		@Override
		public Resource getConfigServerDir() {
			return configServer.getConfigDir();
		}
File
ConfigWebImpl.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
			return configServer.getConfigDir();
		}

<<<<<<< HEAD
		public Map getAllLabels() {
			return configServer.getLabels();
		}

		@Override
		public boolean allowRequestTimeout() {
			return configServer.allowRequestTimeout();
		}
=======
		@Override
		public boolean isMonitoringEnabled() {
			return configServer.isMonitoringEnabled();
		}

		@Override
		public RequestMonitor[] getRequestMonitors() {
			return configServer.getRequestMonitors();
		}

>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
}
Solution content 
			return configServer.getConfigDir();
		}

		public Map getAllLabels() {
			return configServer.getLabels();
		}

		@Override
		public boolean allowRequestTimeout() {
			return configServer.allowRequestTimeout();
		}
}
File
ConfigWebImpl.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
			}
            
            if(doHour) {
<<<<<<< HEAD
            	try{configServer.checkPermGenSpace(true);}catch(Throwable t){}
=======
            	try{ConfigServerImpl.checkPermGenSpace(configServer,true);}catch(Throwable t){}
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
            }
            
            for(int i=0;i
Solution content 
			}
            
            if(doHour) {
            	try{configServer.checkPermGenSpace(true);}catch(Throwable t){}
            }
            
            for(int i=0;i
File
Controler.java
Developer's decision
Version 1
Kind of conflict
Try statement
Chunk
Conflicting content 
		}
    	
    }
<<<<<<< HEAD
=======


>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
}
Solution content 
		}
    	
    }
}
File
Controler.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
    }
    
    public static void updateSSLCertificate(Config config,String host, int port) throws PageException {
<<<<<<< HEAD
    	Resource cacerts=config.getSecurityDirectory();
=======
    	Resource cacerts=getCacerts(config);
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
    	 
    	try {
			CertificateInstaller installer = new CertificateInstaller(cacerts,host,port);
Solution content 
    }
    
    public static void updateSSLCertificate(Config config,String host, int port) throws PageException {
    	Resource cacerts=config.getSecurityDirectory();
    	 
    	try {
			CertificateInstaller installer = new CertificateInstaller(cacerts,host,port);
File
Admin.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    }
    
    public static Query getSSLCertificate(Config config,String host, int port) throws PageException {
<<<<<<< HEAD
    	Resource cacerts=config.getSecurityDirectory();
=======
    	Resource cacerts=getCacerts(config);
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
    	CertificateInstaller installer;
		try {
			installer = new CertificateInstaller(cacerts,host,port);
Solution content 
    }
    
    public static Query getSSLCertificate(Config config,String host, int port) throws PageException {
    	Resource cacerts=config.getSecurityDirectory();
    	CertificateInstaller installer;
		try {
			installer = new CertificateInstaller(cacerts,host,port);
File
Admin.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    }
    
    
<<<<<<< HEAD
=======
    private static Resource getCacerts(Config config) throws PageException {
    	Resource cacerts=null;
    	// javax.net.ssl.trustStore
    	String trustStore = SystemUtil.getPropertyEL("javax.net.ssl.trustStore");
    	if(trustStore!=null){
    		cacerts = ResourcesImpl.getFileResourceProvider().getResource(trustStore);
    	}
    	
    	// security/cacerts
    	if(cacerts==null || !cacerts.exists()) {
    		cacerts = ((ConfigImpl)config).getConfigServerDir().getRealResource("security/cacerts");
    	}
    	return cacerts;
    }
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
Solution content 
    }
File
Admin.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
	 * @throws PageException 
	 */
	public static Cluster getClusterScope(Config config, boolean create) throws PageException {
<<<<<<< HEAD
		if(cluster==null && create) {
	    	cluster=((ConfigImpl)config).createClusterScope();
	    	 
=======
	    if(cluster==null && create) {
	    	cluster=ConfigServerImpl.createClusterScope(config);
>>>>>>> 2416aafa4ad3b71ef3d0f529095da5e1e3de7807
	    }
		return cluster;
	}
Solution content 
	 * @throws PageException 
	 */
	public static Cluster getClusterScope(Config config, boolean create) throws PageException {
		if(cluster==null && create) {
	    	cluster=((ConfigImpl)config).createClusterScope();
	    	 
	    }
		return cluster;
	}
File
ScopeContext.java
Developer's decision
Version 1
Kind of conflict
Attribute
If statement
Method invocation