cvs commit: jahia/src/java/org/jahia/services/fields ContentField.java

[Khue Nguyen]

knguyen     2004/11/05 15:11:35 CET

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/services/fields ContentField.java 
  Log:
  - fix SharedLang when looking for entryState
  
  Revision    Changes    Path
  1.113.2.15  +3 -2      jahia/src/java/org/jahia/services/fields/ContentField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/fields/ContentField.java.diff?r1=1.113.2.14&r2=1.113.2.15&f=h
  
  
  
  Index: ContentField.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/fields/Attic/ContentField.java,v
  retrieving revision 1.113.2.14
  retrieving revision 1.113.2.15
  diff -u -r1.113.2.14 -r1.113.2.15
  --- ContentField.java 29 Oct 2004 13:42:45 -0000      1.113.2.14
  +++ ContentField.java 5 Nov 2004 14:11:35 -0000       1.113.2.15
  @@ -1341,8 +1341,9 @@
           for (int i = 0; i < activeAndStagingEntryStates.size (); i++) {
               ContentObjectEntryState thisEntryState = (ContentObjectEntryState) 
activeAndStagingEntryStates.get (
                       i);
  -            if (thisEntryState.isStaging () && thisEntryState.getLanguageCode 
().equalsIgnoreCase(
  -                    languageCode)) {
  +            if (thisEntryState.isStaging ()
  +                && 
(ContentObject.SHARED_LANGUAGE.equalsIgnoreCase(thisEntryState.getLanguageCode ())
  +                || thisEntryState.getLanguageCode 
().equalsIgnoreCase(languageCode))) {
                   return true;
               }
           }