taylor 2002/11/21 08:01:46
Modified: src/java/org/apache/jetspeed/om/dbpsml
JetspeedGroupProfilePeer.java
JetspeedRoleProfilePeer.java
JetspeedUserProfilePeer.java
Log:
dbpsml fallback bug fixed
Revision Changes Path
1.10 +4 -10
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java
Index: JetspeedGroupProfilePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedGroupProfilePeer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JetspeedGroupProfilePeer.java 15 Oct 2002 17:35:31 -0000 1.9
+++ JetspeedGroupProfilePeer.java 21 Nov 2002 16:01:46 -0000 1.10
@@ -204,15 +204,9 @@
criteria.add(MEDIA_TYPE, locator.getMediaType());
}
- if (language != null && language.length() > 0)
- {
- criteria.add(LANGUAGE, locator.getLanguage());
- }
-
- if (country != null && country.length() > 0)
- {
- criteria.add(COUNTRY, locator.getCountry());
- }
+ criteria.add(LANGUAGE, locator.getLanguage());
+ criteria.add(COUNTRY, locator.getCountry());
+
return criteria;
}
1.10 +3 -9
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedRoleProfilePeer.java
Index: JetspeedRoleProfilePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedRoleProfilePeer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JetspeedRoleProfilePeer.java 15 Oct 2002 17:35:31 -0000 1.9
+++ JetspeedRoleProfilePeer.java 21 Nov 2002 16:01:46 -0000 1.10
@@ -201,15 +201,9 @@
criteria.add(MEDIA_TYPE, locator.getMediaType());
}
- if (language != null && language.length() > 0)
- {
- criteria.add(LANGUAGE, locator.getLanguage());
- }
+ criteria.add(LANGUAGE, locator.getLanguage());
+ criteria.add(COUNTRY, locator.getCountry());
- if (country != null && country.length() > 0)
- {
- criteria.add(COUNTRY, locator.getCountry());
- }
return criteria;
}
}
1.11 +3 -10
jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedUserProfilePeer.java
Index: JetspeedUserProfilePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/dbpsml/JetspeedUserProfilePeer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JetspeedUserProfilePeer.java 15 Oct 2002 17:35:31 -0000 1.10
+++ JetspeedUserProfilePeer.java 21 Nov 2002 16:01:46 -0000 1.11
@@ -212,15 +212,8 @@
criteria.add(MEDIA_TYPE, mediaType);
}
- if (language != null && language.length() > 0)
- {
- criteria.add(LANGUAGE, language);
- }
-
- if (country != null && country.length() > 0)
- {
- criteria.add(COUNTRY, country);
- }
+ criteria.add(LANGUAGE, language);
+ criteria.add(COUNTRY, country);
return criteria;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
