Projects >> railo >>c8d6c38abb9c0af2da9081853ab9ccc0a0d5e4bd

Chunk
Conflicting content
    }


<<<<<<< HEAD
    private CacheItem generateCacheResource(HttpServletRequest req, String key, boolean useId) throws IOException {
    	String filename=req.getServletPath();
    	String qs=ReqRspUtil.getQueryString(req);
        if(!StringUtil.isEmpty(qs)) {
        	filename+="?"+qs;
        	if(useId)filename+="&cfcache_id="+_id;
        }
        else {
        	if(useId)filename+="?cfcache_id="+_id;
        }
    	if(useId && !StringUtil.isEmpty(key)) filename=key;
    	
    	Resource dir = getDirectory();
    	CacheItem ci=new CacheItem();
    	ci.setDirectory(dir);
    	ci.setRaw(filename);
        if(!StringUtil.isEmpty(req.getContextPath())) filename=req.getContextPath()+filename;
        filename=compressFileName(filename)+".cache";
        ci.setName(filename);
        ci.setResource(dir.getRealResource(filename));
        return ci;
=======
    private CacheItem generateCacheResource(String key, boolean useId) throws IOException {
    	return CacheItem.getInstance(pageContext,_id,key,useId,directory,cachename,timespan);
>>>>>>> df5d5db234366f7a9f899d0dcda12832b4987ea6
	}

	
Solution content
    }


    private CacheItem generateCacheResource(String key, boolean useId) throws IOException {
    	return CacheItem.getInstance(pageContext,_id,key,useId,directory,cachename,timespan);
	}

	
File
Cache.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Method signature
Return statement
Variable