Merge branch 'SA-58'

uPortal-Attic · Apr 23, 2012 · 4c86c53 · 4c86c53
2 parents f33cbe5 + c01638e
commit 4c86c53
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...et/src/main/java/org/jasig/schedassist/portlet/PortletSchedulingAssistantServiceImpl.java b/...et/src/main/java/org/jasig/schedassist/portlet/PortletSchedulingAssistantServiceImpl.java
@@ -86,6 +86,9 @@ public final class PortletSchedulingAssistantServiceImpl extends WebServicesDaoS
 	public boolean isEligible(String visitorUsername) {
 		IsEligibleRequest request = new IsEligibleRequest();
 		request.setVisitorNetid(visitorUsername);
+		if(LOG.isDebugEnabled()) {
+			LOG.debug("sending isEligible request for " + visitorUsername);
+		}
 		IsEligibleResponse response = (IsEligibleResponse) this.doSendAndReceive(request);
 		if(LOG.isDebugEnabled()) {
 			LOG.debug("isEligible for " + visitorUsername + " returns " + response.isEligible());
@@ -101,7 +104,7 @@ public EventCancellation cancelAppointment(final String visitorUsername, final l
 			final AvailableBlock block, final String cancelReason) throws SchedulingException {
 
 		if(LOG.isDebugEnabled()) {
-			LOG.debug("cancelAppointment, visitor: " + visitorUsername + ", owner: " + ownerId + ", block: " + block);
+			LOG.debug("sending cancelAppointment request, visitor: " + visitorUsername + ", owner: " + ownerId + ", block: " + block);
 		}
 		CancelAppointmentRequest request = new CancelAppointmentRequest();
 		request.setEndTime(XMLDataUtils.convertDateToXMLGregorianCalendar(block.getEndTime()));
@@ -144,7 +147,7 @@ public VisibleSchedule getVisibleSchedule(String visitorUsername,
 			long ownerId, int weekStart) {
 
 		if(LOG.isDebugEnabled()) {
-			LOG.debug("getVisibleSchedule, visitor: " + visitorUsername + ", owner: " + ownerId);
+			LOG.debug("sending getVisibleSchedule request, visitor: " + visitorUsername + ", owner: " + ownerId);
 		}
 		VisibleScheduleRequest request = new VisibleScheduleRequest();
 		request.setOwnerId(ownerId);

diff --git a/sched-assist-portlet/src/main/java/org/jasig/schedassist/portlet/webflow/FlowHelper.java b/sched-assist-portlet/src/main/java/org/jasig/schedassist/portlet/webflow/FlowHelper.java
@@ -160,7 +160,12 @@ public IPortletScheduleVisitor getCurrentVisitor() {
 	 * @return
 	 */
 	public boolean isCurrentVisitorEligible() {
-		return getCurrentVisitor().isEligible();
+		IPortletScheduleVisitor visitor = getCurrentVisitor();
+		boolean result = visitor.isEligible();
+		if(LOG.isDebugEnabled()) {
+			LOG.debug(visitor + " has eligibility: " + result);
+		}
+		return result;
 	}
 	/**
 	 *