/*
 * Copyright 2007 The Kuali Foundation
 *
 * Licensed under the Educational Community License, Version 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.opensource.org/licenses/ecl1.php
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.kuali.rice.kew.service.impl;

import java.util.ArrayList;
import java.util.List;

import org.kuali.rice.kim.bo.impl.KimAttributes;
import org.kuali.rice.kim.bo.role.dto.KimPermissionInfo;
import org.kuali.rice.kim.bo.types.dto.AttributeSet;
import org.kuali.rice.kns.service.impl.DocumentTypePermissionTypeServiceImpl;

/**
 * @author Kuali Rice Team (kuali-rice@googlegroups.com)
 */
public class DocumentTypeAndActionRequestTypePermissionTypeServiceImpl extends DocumentTypePermissionTypeServiceImpl {

	{
		requiredAttributes.add( KimAttributes.ACTION_REQUEST_CD );
	}
	/**
	 * @see org.kuali.rice.kns.service.impl.DocumentTypePermissionTypeServiceImpl#performPermissionMatches(org.kuali.rice.kim.bo.types.dto.AttributeSet, java.util.List)
	 */
	@Override
	public List<KimPermissionInfo> performPermissionMatches(AttributeSet requestedDetails,
			List<KimPermissionInfo> permissionsList) {
		List<KimPermissionInfo> matchingPermissions = new ArrayList<KimPermissionInfo>();
		// loop over the permissions, checking the non-document-related ones
		for ( KimPermissionInfo kpi : permissionsList ) {
			if ( kpi.getDetails().get(KimAttributes.ACTION_REQUEST_CD).equals(requestedDetails.get(KimAttributes.ACTION_REQUEST_CD) ) ) {
				matchingPermissions.add( kpi );
			}			
		}
		// now, filter the list to just those for the current document
		matchingPermissions = super.performPermissionMatches( requestedDetails, matchingPermissions );
		return matchingPermissions;
	}
	
}

@@ -703,16 +703,60 @@
 .List;%0A%0A
+import org.apache.commons.lang.StringUtils;%0A
 import o
@@ -1642,16 +1642,102 @@
 nfo%3E();%0A
+%09%09if ( requestedDetails == null ) %7B%0A%09%09%09return matchingPermissions;  // empty list%0A%09%09%7D%0A
 %09%09// loo
@@ -1858,16 +1858,36 @@
 %0A%09%09%09if (
+ StringUtils.equals(
  kpi.get
@@ -1932,24 +1932,18 @@
 UEST_CD)
-.equals(
+, 
 requeste

Fix for an NPE in this permission type service.