Index: lams_common/.classpath
===================================================================
diff -u -r713fdb17739e31e966736659f72f01ce087f38d1 -r0cf3b837f37930f11b640ce74c232b84d4a32731
--- lams_common/.classpath	(.../.classpath)	(revision 713fdb17739e31e966736659f72f01ce087f38d1)
+++ lams_common/.classpath	(.../.classpath)	(revision 0cf3b837f37930f11b640ce74c232b84d4a32731)
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="src" path="conf/hibernate/mappings"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-central.jar" sourcepath="/lams_central"/>
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-contentrepository.jar" sourcepath="/lams_contentrepository"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
@@ -26,7 +25,7 @@
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/jstl/api/main/jboss-jstl-api_1.2_spec-1.1.2.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/mail/api/main/javax.mail-1.5.1.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/transaction/api/main/jboss-transaction-api_1.2_spec-1.0.0.Final.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-4.3.7.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-4.3.11.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
 		</attributes>
@@ -46,6 +45,7 @@
 	<classpathentry kind="lib" path="/lams_build/lib/lams/lams-gradebook.jar" sourcepath="/lams_gradebook"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/as/controller-client/main/wildfly-controller-client-8.2.1.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/dmr/main/jboss-dmr-1.2.0.Final.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="output" path="bin"/>
 	<referencedentry kind="lib" path="/lams_build/lib/lams/lams.jar" sourcepath=""/>
 </classpath>
Fisheye: Tag e685b556979e8e732d257191512d4cbe2dc33bd8 refers to a dead (removed) revision in file `lams_common/.settings/org.jboss.ide.eclipse.as.core.prefs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
===================================================================
diff -u -rd928f8397a77aae7efcf5b65c50222d2cec053be -r0cf3b837f37930f11b640ce74c232b84d4a32731
--- lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java	(.../RatingService.java)	(revision d928f8397a77aae7efcf5b65c50222d2cec053be)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java	(.../RatingService.java)	(revision 0cf3b837f37930f11b640ce74c232b84d4a32731)
@@ -378,9 +378,9 @@
 	    mapOrderIdToRatingCriteria.put(ratingCriteriaIter.getOrderId(), ratingCriteriaIter);
 	}
 	
-	for ( Map.Entry entry : request.getParameterMap().entrySet()) {
-	    log.debug("entry: "+entry.getKey()+" "+entry.getValue());
-	}
+//	for ( Map.Entry entry : request.getParameterMap().entrySet()) {
+//	    log.debug("entry: "+entry.getKey()+" "+entry.getValue());
+//	}
 	
 	int criteriaMaxOrderId = WebUtil.readIntParam(request, "criteriaMaxOrderId");
 	// i is equal to an old orderId
@@ -415,13 +415,14 @@
 		maxRatings = WebUtil.readIntParam(request, "maximumRates" + i, true);
 	    } 
 	    
-	    if ( ratingStyle == RatingCriteria.RATING_STYLE_COMMENT ) {
-		explicitCommentTypeFound = true;
-	    }
 
 	    boolean commentsEnabled = ( ratingStyle != RatingCriteria.RATING_STYLE_COMMENT ? WebUtil.readBooleanParam(request,  "enableComments" + i, false) : true );
 	    
 	    RatingCriteria ratingCriteria = mapOrderIdToRatingCriteria.get(i);
+	    if ( ratingStyle == RatingCriteria.RATING_STYLE_COMMENT || (ratingCriteria != null && ratingCriteria.isCommentRating()) ) {
+		explicitCommentTypeFound = true;
+	    }
+	    
 	    if (StringUtils.isNotBlank(criteriaTitle)) {
 		int newCriteriaOrderId = WebUtil.readIntParam(request, "criteriaOrderId" + i);