Changeset 1454

Show
Ignore:
Timestamp:
11/07/08 14:50:54 (2 months ago)
Author:
droos
Message:

fix two bugs: (1) deserialization of attributes on instance nodes; (2) user id context preloader when no user logged in

Location:
branches/dev/javarosa/org.javarosa.core.model/src/org/javarosa/core/model
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/dev/javarosa/org.javarosa.core.model/src/org/javarosa/core/model/instance/QuestionDataElement.java

    r1366 r1454  
    176176                 
    177177                // read attributes 
    178                 Vector attStrings = ExtUtil.nullIfEmpty((Vector)ExtUtil.read(in, new ExtWrapList(), pf)); 
     178                Vector attStrings = ExtUtil.nullIfEmpty((Vector)ExtUtil.read(in, new ExtWrapList(String.class), pf)); 
    179179                setAttributesFromSingleStringVector(attStrings); 
    180180 

  • branches/dev/javarosa/org.javarosa.core.model/src/org/javarosa/core/model/utils/ContextPreloadHandler.java

    r999 r1454  
    5757        private IAnswerData preloadContext(String preloadParams) { 
    5858                String value = ""; 
    59                 String userVal = this.context.getCurrentUser(); 
    60                 System.out.println("LOGIN NAME IS "+userVal); 
    61                 if ("UserID".equals(preloadParams) && userVal != "") 
    62                 { //retrieve 
    63                         value = userVal; 
     59                if ("UserID".equals(preloadParams)) { 
     60                        String userVal = this.context.getCurrentUser(); 
     61                        System.out.println("LOGIN NAME IS "+userVal); 
     62                         
     63                        if (userVal != null && userVal.length() > 0) 
     64                                value = userVal; 
    6465                } 
    6566                System.out.println(value);