Projects >> picketlink >>6949362a98c989fe269d6e4840da7122cc860568

Chunk
Conflicting content 
     */
    public void setParameter(String paramName, Object value) {
            this.parameters.put(paramName, value);
<<<<<<< HEAD:idm/api/src/main/java/org/picketlink/idm/spi/SecurityContext.java
=======
        } else {
            currentContext.setParameter(paramName, value);
        }
>>>>>>> 1651f698b48c8811d6b9f7e301702fcc3f596d30:idm/api/src/main/java/org/picketlink/idm/spi/IdentityStoreInvocationContext.java
    }

    /**
Solution content 
     */
    public void setParameter(String paramName, Object value) {
        this.parameters.put(paramName, value);
    }

    /**
File
SecurityContext.java
Developer's decision
Version 1
Kind of conflict
Method invocation