Commits

Juan Carlos Picado Herrera committed d502980 Merge

Merge branch 'dianmorales', remote-tracking branch 'origin' into development

  • Participants
  • Parent commits ad6089b, d1315fe 1
    1. 6b47a76

Comments (0)

Files changed (2)

encuestame-mvc/src/main/java/org/encuestame/mvc/view/PictureProfileFactoryController.java

     /**
      * Log.
      */
+<<<<<<< .merge_file_Ucb9vq
+    @RequestMapping( value = "/picture/profile/{username}/thumbnail", method = RequestMethod.GET )
+    @ResponseBody
+    public byte[] getPictureThumbnail(
+            @PathVariable String username) throws EnMeNoResultsFoundException{
+=======
     private Logger log = Logger.getLogger(this.getClass());
 
 
      * @return
      */
     private byte[] getPicture(String username, final PictureType pictureType){
+>>>>>>> .merge_file_B7Gwiq
         byte[] bytes = {};
         username = filterValue(username);
         try {
             bytes = getPictureService().getProfilePicture(username, pictureType);
         } catch (FileNotFoundException e) {
+<<<<<<< .merge_file_Ucb9vq
+            // if the user doesn't have picture.
+
+=======
             log.error("file not found "+e);
+>>>>>>> .merge_file_B7Gwiq
         } catch (IOException e) {
             log.error("IOException "+e);
         } catch (EnMeGenericException e) {

encuestame-war/src/main/webapp/WEB-INF/views/home/web/profile.jsp

                 atom : <a href="<%=request.getContextPath()%>/feed/${profile.username}/tweetpoll.atom">TweetPoll ATOM for ${profile.username}</a>
             </li>
         </ul>
-    </div>
+</div>
 </div>